Fix merge fallout

[quassel.git] / src / qtui / chatscene.cpp

diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp
index 7d2944c..24394b9 100644 (file)
--- a/src/qtui/chatscene.cpp
+++ b/src/qtui/chatscene.cpp
@@ -579,7 +579,8 @@ void ChatScene::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) {
   QMenu menu;
 
   // zoom actions and similar
-  chatView()->addActionsToMenu(&menu);
+  chatView()->addActionsToMenu(&menu, pos);
+  menu.addSeparator();
 
   if(isPosOverSelection(pos))
     menu.addAction(SmallIcon("edit-copy"), tr("Copy Selection"),
@@ -670,7 +671,7 @@ void ChatScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
 }
 
 void ChatScene::clickTimeout() {
-  if(!_leftButtonPressed && _clickMode == SingleClick)
+  if(!_leftButtonPressed && _clickMode == SingleClick && !_clickHandled)
     handleClick(Qt::LeftButton, _clickPos);
 }