[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd' - wsd/DocumentBroker.cpp

[Pranav Kant]

 wsd/DocumentBroker.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit be3c1d2c8d31d427cb5cc9cff41189733cf1a7ef
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Wed Jun 21 16:52:03 2017 +0530

    Remove redundant function call
    
    This is called later after the while loop. Breaking out of while loop
    should be enough.
    
    Change-Id: I04979d3af1f475c05b5a43d7afe47770ff69ee25
    Reviewed-on: https://gerrit.libreoffice.org/39086
    Reviewed-by: pranavk <pranavk at collabora.co.uk>
    Tested-by: pranavk <pranavk at collabora.co.uk>
    (cherry picked from commit 6c6ddbe4253152517312a32cc8cb7fdb22633f37)
    Reviewed-on: https://gerrit.libreoffice.org/39702
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 7d482965..a993e3d9 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -242,7 +242,7 @@ void DocumentBroker::pollThread()
         if (ShutdownRequestFlag)
         {
             closeReason = "recycling";
-            shutdownClients(closeReason);
+            _stop = true;
         }
         else if (AutoSaveEnabled && !_stop &&
                  std::chrono::duration_cast<std::chrono::seconds>(now - last30SecCheckTime).count() >= 30)