Changeset 40565 in vbox for trunk

Timestamp:

Mar 21, 2012 2:06:37 PM (13 years ago)

Author:

vboxsync

Message:

Main/Snapshot: fix locking problem when taking a snapshot, and when restoring a snapshot.

File:

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

trunk/src/VBox/Main/src-server/SnapshotImpl.cpp

@@ -1482 +1482 @@
             setMachineState(MachineState_Saving); /** @todo Confusing! Saving is used for both online and offline snapshots. */
 
+        alock.release();
         /* create new differencing hard disks and attach them to this machine */
         rc = createImplicitDiffs(aConsoleProgress,
@@ -1491 +1492 @@
         // if we got this far without an error, then save the media registries
         // that got modified for the diff images
-        alock.release();
         mParent->saveModifiedRegistries();
     }
@@ -1942 +1942 @@
         }
 
-        // release the locks before updating registry and deleting image files
-        alock.release();
-
         // save machine settings, reset the modified flag and commit;
         bool fNeedsGlobalSaveSettings = false;
@@ -1953 +1950 @@
         // unconditionally add the parent registry. We do similar in SessionMachine::EndTakingSnapshot
         // (mParent->saveSettings())
+
+        // release the locks before updating registry and deleting image files
+        alock.release();
+
         mParent->markRegistryModified(mParent->getGlobalRegistryId());