Changeset 22298 in vbox for trunk

Timestamp:

Aug 17, 2009 2:41:04 PM (16 years ago)

Author:

vboxsync

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

51169

Message:

Main: fix locking assertion when discarding snapshots with state when VM has no state

File:

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

trunk/src/VBox/Main/MachineImpl.cpp

@@ -8082 +8082 @@
 
     /* saveSettings() needs mParent lock */
-//     AutoMultiWriteLock2 alock (mParent, this);
+    AutoMultiWriteLock2 alock(mParent, this);
 
     ComAssertRet (!Global::IsOnlineOrTransient (mData->mMachineState), E_FAIL);
@@ -8109 +8109 @@
         if (isModified())
         {
-            snapshotLock.unlock();
-            treeLock.unlock();
-
-            AutoWriteLock vboxLock(mParent);
             rc = saveSettings();
             CheckComRCReturnRC (rc);
-            vboxLock.unlock();
-
-            treeLock.lock();
-            snapshotLock.lock();
         }
     }
@@ -8146 +8138 @@
 
     /* set the proper machine state (note: after creating a Task instance) */
-    setMachineState (MachineState_Discarding);
+    setMachineState(MachineState_Discarding);
 
     /* return the progress to the caller */