Changeset 29540 in vbox

Timestamp:

May 17, 2010 12:37:33 PM (14 years ago)

Author:

vboxsync

Message:

Main/Snapshot: fix lock order violation when restoring a snapshot

File:

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

trunk/src/VBox/Main/SnapshotImpl.cpp

@@ -1703 +1703 @@
     }
 
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    /* discard all current changes to mUserData (name, OSType etc.) (note that
-     * the machine is powered off, so there is no need to inform the direct
-     * session) */
-    if (mData->flModifications)
-        rollback(false /* aNotify */);
-
     HRESULT rc = S_OK;
 
@@ -1718 +1710 @@
     try
     {
+        AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+        /* Discard all current changes to mUserData (name, OSType etc.).
+         * Note that the machine is powered off, so there is no need to inform
+         * the direct session. */
+        if (mData->flModifications)
+            rollback(false /* aNotify */);
+
         /* Delete the saved state file if the machine was Saved prior to this
          * operation */