wsd/LOOLWSD.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 3582012333eceb7a9f5fceca28692ef086842fec
Author: Ashod Nakashian <ashod.nakash...@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 <ashnak...@gmail.com>
Tested-by: Ashod Nakashian <ashnak...@gmail.com>
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index a1272c20..23fbfc81 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1036,7 +1036,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.");
@@ -1065,7 +1065,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();
@@ -1099,7 +1099,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();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
