Changeset 43919 in vbox

Timestamp:

Nov 20, 2012 11:46:25 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Make sure taking online-snapshot progress-dialog is always mac-sheet on mac-host.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp (modified) (2 diffs)

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

@@ -925 +925 @@
         return;
 
-    /* Remember the paused state. */
+    /* Remember the paused state: */
     bool fWasPaused = uisession()->isPaused();
     if (!fWasPaused)
@@ -935 +935 @@
     }
 
+    /* Get current machine: */
     CMachine machine = session().GetMachine();
 
-    VBoxTakeSnapshotDlg dlg(activeMachineWindow(), machine);
-
+    /* Create take-snapshot dialog: */
+    QPointer<VBoxTakeSnapshotDlg> pDlg = new VBoxTakeSnapshotDlg(activeMachineWindow(), machine);
+
+    /* Assign corresponding icon: */
     QString strTypeId = machine.GetOSTypeId();
-    dlg.mLbIcon->setPixmap(vboxGlobal().vmGuestOSTypeIcon(strTypeId));
-
-    /* Search for the max available filter index. */
+    pDlg->mLbIcon->setPixmap(vboxGlobal().vmGuestOSTypeIcon(strTypeId));
+
+    /* Search for the max available filter index: */
     QString strNameTemplate = QApplication::translate("UIMachineLogic", "Snapshot %1");
     int iMaxSnapshotIndex = searchMaxSnapshotIndex(machine, machine.FindSnapshot(QString()), strNameTemplate);
-    dlg.mLeName->setText(strNameTemplate.arg(++ iMaxSnapshotIndex));
-
-    if (dlg.exec() == QDialog::Accepted)
-    {
-        CConsole console = session().GetConsole();
-
-        CProgress progress = console.TakeSnapshot(dlg.mLeName->text().trimmed(), dlg.mTeDescription->toPlainText());
-
-        if (console.isOk())
-        {
-            /* Show the "Taking Snapshot" progress dialog */
-            msgCenter().showModalProgressDialog(progress, machine.GetName(), ":/progress_snapshot_create_90px.png", 0, true);
-
-            if (progress.GetResultCode() != 0)
-                msgCenter().cannotTakeSnapshot(progress);
-        }
-        else
-            msgCenter().cannotTakeSnapshot(console);
-    }
-
-    /* Restore the running state if needed. */
+    pDlg->mLeName->setText(strNameTemplate.arg(++ iMaxSnapshotIndex));
+
+    /* Exec the dialog: */
+    bool fDialogAccepted = pDlg->exec() == QDialog::Accepted;
+
+    /* Is the dialog still valid? */
+    if (pDlg)
+    {
+        /* Acquire variables: */
+        QString strSnapshotName = pDlg->mLeName->text().trimmed();
+        QString strSnapshotDescription = pDlg->mTeDescription->toPlainText();
+
+        /* Destroy dialog early: */
+        delete pDlg;
+
+        /* Was the dialog accepted? */
+        if (fDialogAccepted)
+        {
+            /* Prepare the take-snapshot progress: */
+            CConsole console = session().GetConsole();
+            CProgress progress = console.TakeSnapshot(strSnapshotName, strSnapshotDescription);
+            if (console.isOk())
+            {
+                /* Show the take-snapshot progress: */
+                msgCenter().showModalProgressDialog(progress, machine.GetName(), ":/progress_snapshot_create_90px.png", 0, true);
+                if (progress.GetResultCode() != 0)
+                    msgCenter().cannotTakeSnapshot(progress);
+            }
+            else
+                msgCenter().cannotTakeSnapshot(console);
+        }
+    }
+
+    /* Restore the running state if needed: */
     if (!fWasPaused)
     {