[Libreoffice-commits] online.git: wsd/LOOLWSD.cpp

[Michael Meeks]

 wsd/LOOLWSD.cpp |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit bb4459a288fa072698a2a4d35f325d3e60c63f3c
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Wed Apr 5 21:48:35 2017 +0100

    Give up on doing thread checks during late shutdown.
    
    Change-Id: Icb600e4d734e075bec6c2cf6adbb2afd58c0d98b
    Reviewed-on: https://gerrit.libreoffice.org/36180
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 62879c1d..d2506f24 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2485,6 +2485,10 @@ int LOOLWSD::innerMain()
     LOG_INF("Cleaning up lingering documents.");
     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