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

Timestamp:

Jan 18, 2010 7:12:45 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

56723

Message:

Main: fix regression from today that media registry was not saved during restoreSnapshot()

Location:

trunk/src/VBox/Main

Files:

• MediumImpl.cpp (modified) (1 diff)
• SnapshotImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/MediumImpl.cpp

@@ -4130 +4130 @@
     if (FAILED(rc)) return rc;
 
-    ComObjPtr <Progress> progress;
+    ComObjPtr<Progress> progress;
 
     if (aProgress != NULL)

trunk/src/VBox/Main/SnapshotImpl.cpp

@@ -1760 +1760 @@
         /* grab differencing hard disks from the old attachments that will
          * become unused and need to be auto-deleted */
-
         std::list< ComObjPtr<MediumAttachment> > llDiffAttachmentsToDelete;
 
@@ -1801 +1800 @@
 
         // detach the current-state diffs that we detected above and build a list of
-        // images to delete _after_ saveSettings()
+        // image files to delete _after_ saveSettings()
 
         MediaList llDiffsToDelete;
@@ -1835 +1834 @@
 
         AutoWriteLock vboxLock(mParent COMMA_LOCKVAL_SRC_POS);
-        if (fNeedsSaveSettings)
-            // VirtualBox.xml needs saving too: must not hold machine lock at this point!
-            mParent->saveSettings();
-
         alock.enter();
 
-        // save all settings, reset the modified flag and commit;
+        // save machine settings, reset the modified flag and commit;
         rc = saveSettings(SaveS_ResetCurStateModified | saveFlags);
         if (FAILED(rc)) throw rc;
+
+        // let go of the locks while we're deleting image files below
+        alock.leave();
+        vboxLock.release();
 
         // from here on we cannot roll back on failure any more
@@ -1854 +1853 @@
             LogFlowThisFunc(("Deleting old current state in differencing image '%s'\n", pMedium->getName().raw()));
 
-            HRESULT rc2 = pMedium->deleteStorageAndWait(NULL /*aProgress*/, NULL /*pfNeedsSaveSettings*/ );
+            HRESULT rc2 = pMedium->deleteStorageAndWait(NULL /*aProgress*/, &fNeedsSaveSettings);
             // ignore errors here because we cannot roll back after saveSettings() above
             if (SUCCEEDED(rc2))
                 pMedium->uninit();
+        }
+
+        if (fNeedsSaveSettings)
+        {
+            // finally, VirtualBox.xml needs saving too
+            vboxLock.acquire();
+            mParent->saveSettings();
         }
     }