Changeset 52686 in vbox

Timestamp:

Sep 10, 2014 6:16:52 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: 7462: Mac OS X: Runtime UI: Prevent Machine menu sub-menus being consumed by the Dock menu.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -1008 +1008 @@
     QMenu *pDockMenu = actionPool()->action(UIActionIndexRT_M_Dock)->menu();
 
-    /* Add all VM menu entries to the dock menu. Leave out close and stuff like
-     * this. */
+    /* Add all the 'Machine' menu entries to the 'Dock' menu: */
     QList<QAction*> actions = actionPool()->action(UIActionIndexRT_M_Machine)->menu()->actions();
     for (int i=0; i < actions.size(); ++i)
-        if (actions.at(i)->menuRole() == QAction::NoRole)
-            pDockMenu->addAction(actions.at(i));
+    {
+        /* Check if we really have correct action: */
+        UIAction *pAction = qobject_cast<UIAction*>(actions.at(i));
+        /* Skip incorrect actions: */
+        if (!pAction)
+            continue;
+        /* Skip actions which have 'role' (to prevent consuming): */
+        if (pAction->menuRole() != QAction::NoRole)
+            continue;
+        /* Skip actions which have menu (to prevent consuming): */
+        if (qobject_cast<UIActionMenu*>(pAction))
+            continue;
+        pDockMenu->addAction(actions.at(i));
+    }
     pDockMenu->addSeparator();