wsd/LOOLWSD.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit a22118df104aa9ffd7834fef232a3c31ee0aeead
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date: Thu Apr 6 02:29:25 2017 -0400
wsd: inhibit thread checks sooner when shutting down
LOOLWSDServer::stop() now removes the accept_poll
socket, which will assertCorrectThread. So we need
to disable checks before it.
Change-Id: I3445610c1c48c2b4c23bcfcbc87e236b36d18c0b
Reviewed-on: https://gerrit.libreoffice.org/36185
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 e5d4cb68..ac721294 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2474,6 +2474,9 @@ int LOOLWSD::innerMain()
LOG_INF("Stopping server socket listening. ShutdownFlag: " <<
ShutdownRequestFlag << ", TerminationFlag: " << TerminationFlag);
+ // Disable thread checking - we'll now cleanup lots of things if we can
+ Socket::InhibitThreadChecks = true;
+
// Wait until documents are saved and sessions closed.
srv.stop();
@@ -2482,9 +2485,6 @@ int LOOLWSD::innerMain()
for (auto& docBrokerIt : DocBrokers)
docBrokerIt.second->joinThread();
- // Disable thread checking - we'll now cleanup lots of things if we can
- Socket::InhibitThreadChecks = true;
-
DocBrokers.clear();
#ifndef KIT_IN_PROCESS
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
