Changeset 27278 in vbox for trunk/src/VBox/Main/SnapshotImpl.cpp

Timestamp:

Mar 11, 2010 12:32:23 PM (15 years ago)

Author:

vboxsync

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

58674

Message:

Main: fix snapshot regression from yesterday (media registry not saved after takeSnapshot())

File:

• trunk/src/VBox/Main/SnapshotImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/SnapshotImpl.cpp

@@ -1398 +1398 @@
 
 /**
- * Implementation for IInternalMachineControl::beginTakingSnapshot().
+ * Implementation for IInternalMachineControl::endTakingSnapshot().
  *
  * Called by the Console when it's done saving the VM state into the snapshot
@@ -1418 +1418 @@
     AssertComRCReturn (autoCaller.rc(), autoCaller.rc());
 
-    AutoMultiWriteLock2 alock(mParent, this COMMA_LOCKVAL_SRC_POS);
+    AutoWriteLock machineLock(this COMMA_LOCKVAL_SRC_POS);
 
     AssertReturn(   !aSuccess
@@ -1462 +1462 @@
         rc = saveSettings(NULL);
                 // no need to change for whether VirtualBox.xml needs saving since
-                // we can't have a machine XML rename pending at this point
+                // we'll save the global settings below anyway
     }
 
@@ -1493 +1493 @@
     mSnapshotData.mLastState = MachineState_Null;
     mSnapshotData.mSnapshot.setNull();
+
+    // save VirtualBox.xml (media registry most probably changed with diff image)
+    machineLock.release();
+    AutoWriteLock vboxLock(mParent COMMA_LOCKVAL_SRC_POS);
+    mParent->saveSettings();
 
     return rc;