Changeset 68459 in vbox for trunk/src/VBox/Frontends

Timestamp:

Aug 18, 2017 10:33:01 AM (7 years ago)

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp

@@ -46 +46 @@
 # include "UISelectorWindow.h"
 # include "UIVirtualBoxEventHandler.h"
+# include "UIModalWindowManager.h"
 
 /* COM includes: */
@@ -889 +890 @@
         strGroupName = pGroup->fullName();
 
-    /* Prepare the new VM wizard: */
-    UISafePointerWizardNewVM pWizard = new UIWizardNewVM(m_pChooser->selector(), strGroupName);
+    /* Lock the action preventing cascade calls: */
+    actionPool()->action(UIActionIndexST_M_Machine_S_New)->setEnabled(false);
+    actionPool()->action(UIActionIndexST_M_Group_S_New)->setEnabled(false);
+
+    /* Use the "safe way" to open stack of Mac OS X Sheets: */
+    QWidget *pWizardParent = windowManager().realParentWindow(m_pChooser->selector());
+    UISafePointerWizardNewVM pWizard = new UIWizardNewVM(pWizardParent, strGroupName);
+    windowManager().registerNewParent(pWizard, pWizardParent);
     pWizard->prepare();
 
@@ -900 +907 @@
     if (pWizard)
         delete pWizard;
+
+    /* Unlock the action allowing further calls: */
+    actionPool()->action(UIActionIndexST_M_Machine_S_New)->setEnabled(true);
+    actionPool()->action(UIActionIndexST_M_Group_S_New)->setEnabled(true);
 }