From kde-commits  Sat Nov 30 21:28:14 2013
From: Ralf Habacker <ralf.habacker () freenet ! de>
Date: Sat, 30 Nov 2013 21:28:14 +0000
To: kde-commits
Subject: [umbrello/KDE/4.12] umbrello: Fix of 'Diagram popup menu not displayed at cursor position'.
Message-Id: <E1Vms5G-0007l4-1J () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=138584690909596

Git commit 60614d07fa154b9563e64aa1a4deedef12f4383a by Ralf Habacker.
Committed on 30/11/2013 at 18:20.
Pushed by habacker into branch 'KDE/4.12'.

Fix of 'Diagram popup menu not displayed at cursor position'.

The problem has been caused by handling the diagram context menu on
two source code locations, which results into a race condition.

BUG:328257
(cherry picked from commit 362c2a36fcdd4b2649b3905081552352d7ee1a4c)

M  +0    -2    umbrello/toolbarstatearrow.cpp

http://commits.kde.org/umbrello/60614d07fa154b9563e64aa1a4deedef12f4383a

diff --git a/umbrello/toolbarstatearrow.cpp b/umbrello/toolbarstatearrow.cpp
index 48bbb16..93fa433 100644
--- a/umbrello/toolbarstatearrow.cpp
+++ b/umbrello/toolbarstatearrow.cpp
@@ -125,8 +125,6 @@ void ToolBarStateArrow::mouseReleaseEmpty()
         while (!m_selectionRect.isEmpty())
             delete m_selectionRect.takeFirst();
         m_selectionRect.clear();
-    } else if (m_pMouseEvent->button() =3D=3D Qt::RightButton) {
-        m_pUMLScene->setMenu(m_pMouseEvent->scenePos().toPoint());
     }
 }
=20