Changeset 8310 in vbox

Timestamp:

Apr 22, 2008 7:36:46 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

30067

Message:

Main: Uninitialize remote sessions after the session state is set to Closed on the server to make sure they can be immediately reopened again for the same machine.

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().
@@ -7496 +7476 @@
     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 */