vbox的更動 49638 路徑 trunk/src/VBox/Main/src-client/GuestDirectoryImpl.cpp

時間撮記:

2013-11-25 上午10:33:46 (11 年 以前)

作者:

vboxsync

訊息:

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

檔案:

• trunk/src/VBox/Main/src-client/GuestDirectoryImpl.cpp (修改) (2 筆差異)

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));