Changeset 71564 in vbox

Timestamp:

Mar 29, 2018 11:47:25 AM (7 years ago)

Author:

vboxsync

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

121544

Message:

Guest Control/Main: Added GuestProcessTool::uninit() and also uninitialize the session object there.

Location:

trunk/src/VBox/Main

Files:

• include/GuestProcessImpl.h (modified) (1 diff)
• src-client/GuestProcessImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/include/GuestProcessImpl.h

@@ -216 +216 @@
     int init(GuestSession *pGuestSession, const GuestProcessStartupInfo &startupInfo, bool fAsync, int *pGuestRc);
 
+    void uninit(void);
+
     int getCurrentBlock(uint32_t uHandle, GuestProcessStreamBlock &strmBlock);
 

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

@@ -1958 +1958 @@
 GuestProcessTool::~GuestProcessTool(void)
 {
-     if (!pProcess.isNull())
-     {
-         /* Terminate (and unregister) process. */
-         pProcess->uninit();
-
-         /* Release reference. */
-         pProcess.setNull();
-     }
+    uninit();
 }
 
@@ -2004 +1997 @@
     LogFlowFuncLeaveRC(vrc);
     return vrc;
+}
+
+void GuestProcessTool::uninit(void)
+{
+    if (!pProcess.isNull())
+    {
+        /* Terminate (and unregister) process. */
+        pProcess->uninit();
+
+        /* Release reference. */
+        pProcess.setNull();
+    }
+
+    if (pSession)
+        pSession.setNull();
 }