Changeset 90211 in vbox

Timestamp:

Jul 15, 2021 11:53:07 AM (4 years ago)

Author:

vboxsync

Message:

Additions: X11: main: prevent deadlock on service termination, bugref:10032.

File:

• trunk/src/VBox/Additions/x11/VBoxClient/main.cpp (modified) (1 diff)

trunk/src/VBox/Additions/x11/VBoxClient/main.cpp

@@ -120 +120 @@
         VBClLogFatalError("Failure while acquiring the global critical section, rc=%Rrc\n", rc);
 
-    /* Try to gracefuly terminate a service. Service needs
-     * to be stopped first and then terminated. */
-    if (g_Service.pDesc)
-    {
-        if (g_Service.pDesc->pfnStop)
-            g_Service.pDesc->pfnStop();
-
-        if (g_Service.pDesc->pfnTerm)
-            g_Service.pDesc->pfnTerm();
+    /* Ask service to stop. */
+    if (g_Service.pDesc &&
+        g_Service.pDesc->pfnStop)
+    {
+        ASMAtomicWriteBool(&g_Service.fShutdown, true);
+        g_Service.pDesc->pfnStop();
+
     }