Changeset 68456 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Aug 18, 2017 9:59:34 AM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

117599

Message:

FE/Qt: bugref:6669: macOS: Make sure Clone VM wizard is using proper widget stacking (necessary for macOS sheets to avoid modal loop hang).

File:

• trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

@@ -674 +674 @@
     AssertMsgReturnVoid(pItem, ("Current item should be selected!\n"));
 
-    /* Show Clone VM wizard: */
-    UISafePointerWizard pWizard = new UIWizardCloneVM(this, pItem->machine());
+    /* Lock the action preventing cascade calls: */
+    actionPool()->action(UIActionIndexST_M_Machine_S_Clone)->setEnabled(false);
+
+    /* Use the "safe way" to open stack of Mac OS X Sheets: */
+    QWidget *pWizardParent = windowManager().realParentWindow(this);
+    UISafePointerWizard pWizard = new UIWizardCloneVM(pWizardParent, pItem->machine());
+    windowManager().registerNewParent(pWizard, pWizardParent);
     pWizard->prepare();
     pWizard->exec();
     if (pWizard)
         delete pWizard;
+
+    /* Unlock the action allowing further calls: */
+    actionPool()->action(UIActionIndexST_M_Machine_S_Clone)->setEnabled(true);
 }