Changeset 3421 in vbox for trunk/src/VBox

Timestamp:

Jul 4, 2007 4:06:12 PM (18 years ago)

Author:

vboxsync

Message:

Main: Fixed an assertion when closing the direct machine session after changing machine controller properties but w/o saving them.

File:

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

trunk/src/VBox/Main/USBControllerImpl.cpp

@@ -445 +445 @@
  *  Loads settings from the configuration node.
  *
- *  @note Locks objects for reading!
+ *  @note Locks objects for writing!
  */
 HRESULT USBController::loadSettings (CFGNODE aMachine)
 {
-    ComAssertRet (aMachine, E_FAIL);
-
-    AutoCaller autoCaller (this);
-    CheckComRCReturnRC (autoCaller.rc());
+    AssertReturn (aMachine, E_FAIL);
+
+    AutoCaller autoCaller (this);
+    AssertComRCReturnRC (autoCaller.rc());
 
     AutoLock alock (this);
@@ -525 +525 @@
 HRESULT USBController::saveSettings (CFGNODE aMachine)
 {
-    ComAssertRet (aMachine, E_FAIL);
+    AssertReturn (aMachine, E_FAIL);
 
     AutoCaller autoCaller (this);
@@ -681 +681 @@
 
     /* we need the machine state */
-    Machine::AutoMutableStateDependency adep (mParent);
+    Machine::AutoAnyStateDependency adep (mParent);
     AssertComRCReturn (adep.rc(), false);
 
@@ -954 +954 @@
 #else
     /* we need the machine state */
-    Machine::AutoMutableStateDependency adep (mParent);
+    Machine::AutoAnyStateDependency adep (mParent);
     AssertComRCReturnRC (adep.rc());