Changeset 92271 in vbox for trunk

Timestamp:

Nov 8, 2021 2:47:09 PM (3 years ago)

Author:

vboxsync

Message:

Main/Session::getRemoteConsole: Don't assert here as there seems to be some kind of shutdown race when running stuff in the validation kit with the GUI as frontend.

File:

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

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

@@ -265 +265 @@
 
 #ifndef VBOX_COM_INPROC_API_CLIENT
-    AssertMsgReturn(mType == SessionType_WriteLock && !!mConsole,
-                    ("This is not a direct session!\n"),
-                    VBOX_E_INVALID_OBJECT_STATE);
-
-    /* return a failure if the session already transitioned to Closing
-     * but the server hasn't processed Machine::OnSessionEnd() yet. */
-    if (mState != SessionState_Locked)
+    if (mType == SessionType_WriteLock && !!mConsole)
+    {
+        /* return a failure if the session already transitioned to Closing
+         * but the server hasn't processed Machine::OnSessionEnd() yet. */
+        if (mState == SessionState_Locked)
+        {
+            mConsole.queryInterfaceTo(aConsole.asOutParam());
+
+            LogFlowThisFuncLeave();
+            return S_OK;
+        }
         return VBOX_E_INVALID_VM_STATE;
-
-    mConsole.queryInterfaceTo(aConsole.asOutParam());
-
-    LogFlowThisFuncLeave();
-
-    return S_OK;
+    }
+    return setError(VBOX_E_INVALID_OBJECT_STATE, "This is not a direct session");
 
 #else  /* VBOX_COM_INPROC_API_CLIENT */