[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4-0' - common/SigUtil.cpp

[Ashod Nakashian (via logerrit)]

 common/SigUtil.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 86c4a093e8fe71f20749292b6100c46083e5646d
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Sun Nov 17 23:17:28 2019 -0500
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Mon Nov 25 15:16:22 2019 +0100

    wsd: SIGTERM signals clean shutdown now
    
    Change-Id: I8d5bf7232036bb103cd7433cd5b1c7b5021e06d4
    (cherry picked from commit 63ee9603e1225ca8480324666a5ad72b0ce42041)
    Reviewed-on: https://gerrit.libreoffice.org/83051
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/common/SigUtil.cpp b/common/SigUtil.cpp
index 50d4ecc71..a899139aa 100644
--- a/common/SigUtil.cpp
+++ b/common/SigUtil.cpp
@@ -111,7 +111,7 @@ namespace SigUtil
     {
         bool hardExit = false;
         const char *domain;
-        if (!ShutdownRequestFlag && signal == SIGINT)
+        if (!ShutdownRequestFlag && (signal == SIGINT || signal == SIGTERM))
         {
             domain = " Shutdown signal received: ";
             ShutdownRequestFlag = true;