alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

avoid potential infinite recursions

Browse Source
This commit is contained in:
Marco Martin 2012-09-21 14:23:41 +02:00
parent 18c1cc8dab
commit d86b233464
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
declarativeimports/plasmacomponents/qmenu.cpp
View File

@ -175,14 +175,18 @@ void QMenuProxy::open(int x, int y)
} }
if (!parentItem || !parentItem->scene()) { if (!parentItem || !parentItem->scene()) {
open(0, 0); m_menu->popup(QPoint(0, 0));
m_status = DialogStatus::Open;
emit statusChanged();
return; return;
} }
QList<QGraphicsView*> views = parentItem->scene()->views(); QList<QGraphicsView*> views = parentItem->scene()->views();
if (views.size() < 1) { if (views.size() < 1) {
open(0, 0); m_menu->popup(QPoint(0, 0));
m_status = DialogStatus::Open;
emit statusChanged();
return; return;
} }
@ -233,14 +237,18 @@ void QMenuProxy::open()
} }
if (!parentItem || !parentItem->scene()) { if (!parentItem || !parentItem->scene()) {
open(0, 0); m_menu->popup(QPoint(0, 0));
m_status = DialogStatus::Open;
emit statusChanged();
return; return;
} }
QList<QGraphicsView*> views = parentItem->scene()->views(); QList<QGraphicsView*> views = parentItem->scene()->views();
if (views.size() < 1) { if (views.size() < 1) {
open(0, 0); m_menu->popup(QPoint(0, 0));
m_status = DialogStatus::Open;
emit statusChanged();
return; return;
} }
@ -264,7 +272,9 @@ void QMenuProxy::open()
} }
if (!view) { if (!view) {
open(0, 0); m_menu->popup(QPoint(0, 0));
m_status = DialogStatus::Open;
emit statusChanged();
return; return;
} }