Changeset 30754 in vbox for trunk/src/VBox/Additions/common/VBoxService/VBoxServicePageSharing.cpp

Timestamp:

Jul 9, 2010 7:52:49 AM (15 years ago)

Author:

vboxsync

Message:

VBoxService/Page Sharing: Fixed crash on exit.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServicePageSharing.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServicePageSharing.cpp

@@ -619 +619 @@
         if (idNewSession != g_idSession)
         {
-            bool fUnregister = false; 
+            bool fUnregister = false;
 
             VBoxServiceVerbose(3, "VBoxServicePageSharingWorker: VM was restored!!\n");
-            /* The VM was restored, so reregister all modules the next time. */ 
-            RTAvlPVDestroy(&g_pKnownModuleTree, VBoxServicePageSharingEmptyTreeCallback, &fUnregister); 
+            /* The VM was restored, so reregister all modules the next time. */
+            RTAvlPVDestroy(&g_pKnownModuleTree, VBoxServicePageSharingEmptyTreeCallback, &fUnregister);
             g_pKnownModuleTree = NULL;
 
@@ -677 +677 @@
     for (;;)
     {
-        VBoxServiceVerbose(3, "VBoxServicePageSharingWorkerProcess: enabled=%d\n", VbglR3PageSharingIsEnabled());
-
-        if (    VbglR3PageSharingIsEnabled()
+        BOOL fEnabled = VbglR3PageSharingIsEnabled();
+        VBoxServiceVerbose(3, "VBoxServicePageSharingWorkerProcess: Enabled = %s\n", fEnabled ? "Yes" : "No");
+
+        if (    fEnabled
             &&  hProcess == NIL_RTPROCESS)
         {
@@ -720 +721 @@
     }
 
-    if (hProcess)
+    if (hProcess != NIL_RTPROCESS)
         RTProcTerminate(hProcess);