[Libreoffice-commits] online.git: Branch 'libreoffice-5-4' - wsd/LOOLWSD.cpp

[Ashod Nakashian]

 wsd/LOOLWSD.cpp |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5307fa09a686c5337efcc937113c37a898d434ab
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Sun Jul 2 22:15:29 2017 -0400

    wsd: don't resurrect forkit when shutting down
    
    Change-Id: I88ebe5e07a5a9f6c0f52cb12e6acb688de763192
    Reviewed-on: https://gerrit.libreoffice.org/39466
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>
    (cherry picked from commit 3582012333eceb7a9f5fceca28692ef086842fec)
    Reviewed-on: https://gerrit.libreoffice.org/48676
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index e6ebfac2..04309102 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1023,7 +1023,7 @@ bool LOOLWSD::checkAndRestoreForKit()
     if (ForKitProcId == -1)
     {
         // Fire the ForKit process for the first time.
-        if (!createForKit())
+        if (!ShutdownRequestFlag && !TerminationFlag && !createForKit())
         {
             // Should never fail.
             LOG_FTL("Failed to spawn loolforkit.");
@@ -1052,7 +1052,7 @@ bool LOOLWSD::checkAndRestoreForKit()
                 }
 
                 // Spawn a new forkit and try to dust it off and resume.
-                if (!createForKit())
+                if (!ShutdownRequestFlag && !TerminationFlag && !createForKit())
                 {
                     LOG_FTL("Failed to spawn forkit instance. Shutting down.");
                     SigUtil::requestShutdown();
@@ -1086,7 +1086,7 @@ bool LOOLWSD::checkAndRestoreForKit()
         {
             // No child processes.
             // Spawn a new forkit and try to dust it off and resume.
-            if (!createForKit())
+            if (!ShutdownRequestFlag && !TerminationFlag && !createForKit())
             {
                 LOG_FTL("Failed to spawn forkit instance. Shutting down.");
                 SigUtil::requestShutdown();