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

Timestamp:

Nov 25, 2013 10:33:46 AM (11 years ago)

Author:

vboxsync

Message:

Main/GuestCtrl: More checks; remove IGuestDirectroy from session list after termination.

Location:

trunk/src/VBox/Main/src-client

Files:

• GuestDirectoryImpl.cpp (modified) (2 diffs)
• GuestProcessImpl.cpp (modified) (1 diff)

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

@@ -284 +284 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    AssertPtr(mSession);
-    int rc = mSession->directoryRemoveFromList(this);
-    AssertRC(rc);
-
     HRESULT hr = S_OK;
 
     int guestRc;
-    rc = mData.mProcessTool.Terminate(30 * 1000, &guestRc);
+    int rc = mData.mProcessTool.Terminate(30 * 1000, &guestRc);
     if (RT_FAILURE(rc))
     {
@@ -313 +309 @@
     }
 
-    /*
-     * Release autocaller before calling uninit.
-     */
-    autoCaller.release();
-
-    uninit();
+    AssertPtr(mSession);
+    int rc2 = mSession->directoryRemoveFromList(this);
+    if (RT_SUCCESS(rc))
+        rc = rc2;
 
     LogFlowThisFunc(("Returning rc=%Rrc\n", rc));

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

@@ -1879 +1879 @@
      * still can hold references to it. */
     AssertPtr(mSession);
-    mSession->processRemoveFromList(this);
+    int rc2 = mSession->processRemoveFromList(this);
+    if (RT_SUCCESS(vrc))
+        vrc = rc2;
 
     LogFlowFuncLeaveRC(vrc);