Changeset 24949 in vbox for trunk/src/VBox/Main

Timestamp:

Nov 25, 2009 12:17:00 PM (15 years ago)

Author:

vboxsync

Message:

Console.cpp: Power off during live save.

File:

• trunk/src/VBox/Main/ConsoleImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -2637 +2637 @@
     try
     {
+        mptrCancelableProgress = pProgress;
+
         /*
          * If we fail here it means a PowerDown() call happened on another
@@ -2670 +2672 @@
         delete pTask;
         NOREF(rc);
+        mptrCancelableProgress.setNull();
     }
 
@@ -7355 +7358 @@
     // 3) saving the state of the virtual machine (here, in the VM process, if the machine is online)
 
-    bool fBeganTakingSnapshot = false;
-    bool fSuspenededBySave = false;
-
-    AutoCaller autoCaller(pTask->mConsole);
-    CheckComRCReturnRC(autoCaller.rc());
-
-    AutoWriteLock alock(pTask->mConsole);
+    Console    *that                 = pTask->mConsole;
+    bool        fBeganTakingSnapshot = false;
+    bool        fSuspenededBySave    = false;
+
+    AutoCaller autoCaller(that);
+    if (FAILED(autoCaller.rc()))
+    {
+        that->mptrCancelableProgress.setNull();
+        return autoCaller.rc();
+    }
+
+    AutoWriteLock alock(that);
 
     HRESULT rc = S_OK;
-
-    Console *that = pTask->mConsole;
 
     try
@@ -7374 +7380 @@
          * others from accessing this machine)
          */
-        rc = pTask->mConsole->mControl->BeginTakingSnapshot(that,
-                                                            pTask->bstrName,
-                                                            pTask->bstrDescription,
-                                                            pTask->mProgress,
-                                                            pTask->fTakingSnapshotOnline,
-                                                            pTask->bstrSavedStateFile.asOutParam());
+        rc = that->mControl->BeginTakingSnapshot(that,
+                                                 pTask->bstrName,
+                                                 pTask->bstrDescription,
+                                                 pTask->mProgress,
+                                                 pTask->fTakingSnapshotOnline,
+                                                 pTask->bstrSavedStateFile.asOutParam());
         if (FAILED(rc))
             throw rc;
@@ -7425 +7431 @@
             if (!pTask->mProgress->notifyPointOfNoReturn())
                 throw setError(E_FAIL, tr("Cancelled"));
+            that->mptrCancelableProgress.setNull();
 
             // STEP 4: reattach hard disks