Changeset 22194 in vbox for trunk/src/VBox

Timestamp:

Aug 12, 2009 8:35:51 AM (15 years ago)

Author:

vboxsync

Message:

Main: fix taking snapshots broken by r50951

Location:

trunk/src/VBox/Main

Files:

• HardDiskImpl.cpp (modified) (1 diff)
• MachineImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/HardDiskImpl.cpp

@@ -2337 +2337 @@
 {
     AutoCaller autoCaller(this);
-    AssertReturn(autoCaller.rc(), "");
+    AssertReturn(!autoCaller.rc(), "");
 
     /* mm.format is const, no need to lock */

trunk/src/VBox/Main/MachineImpl.cpp

@@ -8927 +8927 @@
     AssertComRCReturn (autoCaller.rc(), autoCaller.rc());
 
-    AutoWriteLock alock(this);
+    AutoMultiWriteLock2 alock(mParent, this);
+            // saveSettings needs VirtualBox lock
 
     AssertReturn(!mSnapshotData.mSnapshot.isNull(), E_FAIL);