X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fchatscene.cpp;h=4fdf92a06c05e78285d60343b63316b296d518fa;hb=4b901734bdcd469e5e91cb84f18db1887e6dde74;hp=c6341ecdc85193a033bb64c38571dddc05e6b319;hpb=53c7a85fd154fa18eab6217bfd4b173307c47e5d;p=quassel.git

diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp
index c6341ecd..4fdf92a0 100644
--- a/src/qtui/chatscene.cpp
+++ b/src/qtui/chatscene.cpp
@@ -34,6 +34,7 @@
 #include "client.h"
 #include "clientbacklogmanager.h"
 #include "columnhandleitem.h"
+#include "contextmenuactionprovider.h"
 #include "iconloader.h"
 #include "messagefilter.h"
 #include "qtui.h"
@@ -586,7 +587,7 @@ void ChatScene::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) {
     item->addActionsToMenu(&menu, item->mapFromScene(pos));
   else
     // no item -> default scene actions
-    Client::mainUi()->actionProvider()->addActions(&menu, filter(), BufferId());
+    GraphicalUi::contextMenuActionProvider()->addActions(&menu, filter(), BufferId());
 
   menu.exec(event->screenPos());
 
@@ -865,8 +866,9 @@ void ChatScene::loadWebPreview(ChatItem *parentItem, const QString &url, const Q
   if(webPreview.url != url) {
     webPreview.url = url;
     // prepare to load a different URL
-    if(webPreview.previewItem && webPreview.previewItem->scene()) {
-      removeItem(webPreview.previewItem);
+    if(webPreview.previewItem) {
+      if(webPreview.previewItem->scene())
+	removeItem(webPreview.previewItem);
       delete webPreview.previewItem;
       webPreview.previewItem = 0;
     }