Changeset 56683 in vbox for trunk/src/VBox

Timestamp:

Jun 29, 2015 8:02:42 PM (9 years ago)

Author:

vboxsync

Message:

Session::uninitialize: Shut up assertion that annoys the heck out of me right now (DEBUG_bird).

File:

• trunk/src/VBox/Main/src-client/SessionImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-client/SessionImpl.cpp

@@ -527 +527 @@
         }
 
-        AssertMsgReturn(   mState == SessionState_Locked
-                        || mState == SessionState_Spawning,
-                        ("Session is in wrong state (%ld), expected locked (%ld) or spawning (%ld)\n",
-                         mState, SessionState_Locked, SessionState_Spawning),
-                        VBOX_E_INVALID_VM_STATE);
+        if (   mState == SessionState_Locked
+            || mState == SessionState_Spawning)
+        { /* likely */ }
+        else
+        {
+#ifndef DEBUG_bird /* bird: hitting this all the time running tdAddBaseic1.py. */
+            AssertMsgFailed(("Session is in wrong state (%d), expected locked (%d) or spawning (%d)\n",
+                             mState, SessionState_Locked, SessionState_Spawning));
+#endif
+            return VBOX_E_INVALID_VM_STATE;
+        }
 
         /* close ourselves */