[Libreoffice-commits] online.git: Branch 'private/Ashod/nonblocking' - wsd/LOOLWSD.cpp
Michael Meeks
michael.meeks at collabora.com
Sat Mar 4 16:54:43 UTC 2017
wsd/LOOLWSD.cpp | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 85d18db512fc7c100e5a8743c919cbce18d58198
Author: Michael Meeks <michael.meeks at collabora.com>
Date: Sat Mar 4 16:54:13 2017 +0000
Cleanup shutdown.
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 4ae5516..5996e79 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -3335,6 +3335,8 @@ public:
stop();
if (_serverThread.joinable())
_serverThread.join();
+ if (_documentThread.joinable())
+ _documentThread.join();
}
void start(const Poco::Net::SocketAddress& addr)
More information about the Libreoffice-commits
mailing list