wsd/DocumentBroker.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 1a93758bff85b227ab9d42fb65564a5764466888 Author: Pranav Kant <pran...@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 <pran...@collabora.co.uk> Tested-by: pranavk <pran...@collabora.co.uk> (cherry picked from commit 6c6ddbe4253152517312a32cc8cb7fdb22633f37) Reviewed-on: https://gerrit.libreoffice.org/39767 Reviewed-by: Jan Holesovsky <ke...@collabora.com> Tested-by: Jan Holesovsky <ke...@collabora.com> diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp index c44d0d65..5b4d8d47 100644 --- a/wsd/DocumentBroker.cpp +++ b/wsd/DocumentBroker.cpp @@ -246,7 +246,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) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits