Changeset 13857 in vbox

Timestamp:

Nov 5, 2008 1:37:32 PM (16 years ago)

Author:

vboxsync

Message:

Main: Fixed: VirtualBoxBaseWithChildrenNEXT::uninitDependentChildren() must work in InInit too (r38669 regression).

File:

• trunk/src/VBox/Main/VirtualBoxBase.cpp (modified) (1 diff)

trunk/src/VBox/Main/VirtualBoxBase.cpp

@@ -1099 +1099 @@
      * use the AutoCaller class of course). InUinint is also used as a flag
      * by removeDependentChild() that prevents touching mDependentChildren
-     * from outside. Therefore, we assert.
+     * from outside. Therefore, we assert. Note that InInit is also fine since
+     * no any object may access us by that time.
      */
-    AssertReturnVoid (autoCaller.state() == InUninit);
+    AssertReturnVoid (autoCaller.state() == InUninit ||
+                      autoCaller.state() == InInit);
 
     if (mDependentChildren.size())