Changeset 8311 in vbox for trunk/src/VBox/Main

Timestamp:

Apr 22, 2008 8:48:38 PM (17 years ago)

Author:

vboxsync

Message:

Main: Reverted r30067 because it doesn't help in case of remote sessions that closed themselves before the direct session is closed. Such clients need to ask the server about the session state anyway.

File:

• trunk/src/VBox/Main/MachineImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -7438 +7438 @@
     }
 
+    /* uninitialize all remote controls */
+    if (mData->mSession.mRemoteControls.size())
+    {
+        LogFlowThisFunc (("Closing remote sessions (%d):\n",
+                          mData->mSession.mRemoteControls.size()));
+
+        Data::Session::RemoteControlList::iterator it =
+            mData->mSession.mRemoteControls.begin();
+        while (it != mData->mSession.mRemoteControls.end())
+        {
+            LogFlowThisFunc (("  Calling remoteControl->Uninitialize()...\n"));
+            HRESULT rc = (*it)->Uninitialize();
+            LogFlowThisFunc (("  remoteControl->Uninitialize() returned %08X\n", rc));
+            if (FAILED (rc))
+                LogWarningThisFunc (("Forgot to close the remote session?\n"));
+            ++ it;
+        }
+        mData->mSession.mRemoteControls.clear();
+    }
+
     /*
      *  An expected uninitialization can come only from #checkForDeath().
@@ -7476 +7496 @@
     mData->mSession.mState = SessionState_Closed;
     mData->mSession.mType.setNull();
-
-    /* uninitialize all remote controls (note that we do it after we set the
-     * session state to SessionState_Closed to make sure that uninitialized
-     * remote sessions can be immediately reopened for the same machine again
-     * once we fihish with uninit)*/
-    if (mData->mSession.mRemoteControls.size())
-    {
-        LogFlowThisFunc (("Closing remote sessions (%d):\n",
-                          mData->mSession.mRemoteControls.size()));
-
-        Data::Session::RemoteControlList::iterator it =
-            mData->mSession.mRemoteControls.begin();
-        while (it != mData->mSession.mRemoteControls.end())
-        {
-            LogFlowThisFunc (("  Calling remoteControl->Uninitialize()...\n"));
-            HRESULT rc = (*it)->Uninitialize();
-            LogFlowThisFunc (("  remoteControl->Uninitialize() returned %08X\n", rc));
-            if (FAILED (rc))
-                LogWarningThisFunc (("Forgot to close the remote session?\n"));
-            ++ it;
-        }
-        mData->mSession.mRemoteControls.clear();
-    }
 
     /* close the interprocess semaphore before leaving the shared lock */