desktop/source/app/app.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
New commits: commit 6f2b2721e52bf9f3a59e1dd88f499f438676d25f Author: Markus Mohrhard <[email protected]> Date: Sun Nov 27 18:40:38 2016 +0100 fix exception on windows when thread is not joinable Change-Id: I1f8c8136e45b92a4143b802ea09257da2eec6a89 diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index f1727be..f2fa1ca 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1770,7 +1770,8 @@ int Desktop::doShutdown() if( ! pExecGlobals ) return EXIT_SUCCESS; - m_aUpdateThread.join(); + if (m_aUpdateThread.joinable()) + m_aUpdateThread.join(); pExecGlobals->bRestartRequested = pExecGlobals->bRestartRequested || OfficeRestartManager::get(comphelper::getProcessComponentContext())-> _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
