Changeset 41159 in vbox for trunk

Timestamp:

May 4, 2012 1:54:46 AM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: 6141: Fixing crash which happens if settings-dialog is opened during VM poweroff/shutdown.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIMainDialog.cpp (modified) (1 diff)
• runtime/UIMachineLogic.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMainDialog.cpp

@@ -48 +48 @@
 QDialog::DialogCode QIMainDialog::exec()
 {
-    AssertMsg (!mEventLoop, ("exec is called recursively!\n"));
-
-    /* Reset the result code */
-    setResult (QDialog::Rejected);
-    bool deleteOnClose = testAttribute (Qt::WA_DeleteOnClose);
-    setAttribute (Qt::WA_DeleteOnClose, false);
-    bool wasShowModal = testAttribute (Qt::WA_ShowModal);
-    setAttribute (Qt::WA_ShowModal, true);
-
-    /* Create a local event loop */
-    mEventLoop = new QEventLoop();
-    /* Show the window */
+    /* Check for the recursive run: */
+    AssertMsg(!mEventLoop, ("QIMainDialog::exec() is called recursively!\n"));
+
+    /* Reset the result code: */
+    setResult(QDialog::Rejected);
+
+    /* Tune some attributes: */
+    bool fDeleteOnClose = testAttribute(Qt::WA_DeleteOnClose);
+    AssertMsg(!fDeleteOnClose, ("QIMainDialog is NOT supposed to be run in 'delete-on-close' mode!"));
+    setAttribute(Qt::WA_DeleteOnClose, false);
+    bool fWasShowModal = testAttribute(Qt::WA_ShowModal);
+    setAttribute(Qt::WA_ShowModal, true);
+
+    /* Create a local event-loop: */
+    QEventLoop eventLoop;
+    mEventLoop = &eventLoop;
+    /* Show the window: */
     show();
-    /* A guard to ourself for the case we destroy ourself. */
+    /* A guard to ourself for the case we destroy ourself: */
     QPointer<QIMainDialog> guard = this;
-    /* Start the event loop. This blocks. */
-    mEventLoop->exec();
-    /* Delete the event loop */
-    delete mEventLoop;
-    /* Are we valid anymore? */
+    /* Start the event-loop: */
+    eventLoop.exec();
+    /* Check if dialog is still valid: */
     if (guard.isNull())
         return QDialog::Rejected;
+    mEventLoop = 0;
+    /* Prepare result: */
     QDialog::DialogCode res = result();
-    /* Set the old show modal attribute */
-    setAttribute (Qt::WA_ShowModal, wasShowModal);
-    /* Delete us in the case we should do so on close */
-    if (deleteOnClose)
-        delete this;
-    /* Return the final result */
+    /* Restore old show-modal attribute: */
+    setAttribute(Qt::WA_ShowModal, fWasShowModal);
+    /* Return the final result: */
     return res;
 }

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

@@ -1061 +1061 @@
         return;
 
-    /* Create and execute current VM settings dialog: */
-    UISettingsDialogMachine dlg(activeMachineWindow(), session().GetMachine().GetId(), strCategory, QString());
-    dlg.execute();
+    /* Create VM settings dialog on the heap!
+     * Its necessary to allow QObject hierarchy cleanup to delete this dialog if necessary: */
+    QPointer<UISettingsDialogMachine> pDialog = new UISettingsDialogMachine(activeMachineWindow(),
+                                                                            session().GetMachine().GetId(),
+                                                                            strCategory, QString());
+    /* Executing VM settings dialog.
+     * This blocking function calls for the internal event-loop to process all further events,
+     * including event which can delete the dialog itself. */
+    pDialog->execute();
+    /* Delete dialog if its still valid: */
+    if (pDialog)
+        delete pDialog;
 }