Changeset 24277 in vbox for trunk/src

Timestamp:

Nov 2, 2009 8:25:02 PM (15 years ago)

Author:

vboxsync

Message:

Main: fix restoreSnapshot() which updated the current snapshot only for online snapshots

File:

• trunk/src/VBox/Main/MachineImpl.cpp (modified) (6 diffs)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -9616 +9616 @@
     MultiResult rc(S_OK);
 
-    Snapshot *pOldFirstSnap = mData->mFirstSnapshot;
-    Snapshot *pOldCurrentSnap = mData->mCurrentSnapshot;
+    ComObjPtr<Snapshot> pOldFirstSnap = mData->mFirstSnapshot;
+    ComObjPtr<Snapshot> pOldCurrentSnap = mData->mCurrentSnapshot;
 
     bool fOnline = Global::IsOnline(mSnapshotData.mLastState);
@@ -10119 +10119 @@
 
                 if (RT_SUCCESS(vrc))
-                {
                     mSSData->mStateFilePath = stateFilePath;
-
-                    /* make the snapshot we restored from the current snapshot */
-                    mData->mCurrentSnapshot = aTask.m_pSnapshot;
-                }
                 else
                     throw setError(E_FAIL,
@@ -10132 +10127 @@
                                    vrc);
             }
+
+            LogFlowThisFunc(("Setting new current snapshot {%RTuuid}\n", aTask.m_pSnapshot->getId().raw()));
+            /* make the snapshot we restored from the current snapshot */
+            mData->mCurrentSnapshot = aTask.m_pSnapshot;
         }
 
@@ -10206 +10205 @@
         }
 
-        /* save all settings, reset the modified flag and commit */
+        // save all settings, reset the modified flag and commit;
+        // from here on we cannot roll back on failure any more
         rc = saveSettings(SaveS_ResetCurStateModified | saveFlags);
 
@@ -10217 +10217 @@
 
             HRESULT rc2 = pMedium->deleteStorageAndWait();
+            // ignore errors here because we cannot roll back after saveSettings() above
             if (SUCCEEDED(rc2))
                 pMedium->uninit();
@@ -10231 +10232 @@
         ErrorInfoKeeper eik;
 
-        /* undo all changes on failure unless the subtask has done so */
+        /* undo all changes on failure */
         rollback(false /* aNotify */);