diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-11-27 18:40:38 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-05-19 03:43:25 +0200 |
| commit | 7f67f05c9f7875d684d24bfb59aa8def150ac788 (patch) | |
| tree | 15302773dacfb8cf5ad9df449b12b7b8a0015a60 /desktop | |
| parent | e59ef0e4b6895591a4f561fbc31617ceb3239d2b (diff) | |
fix exception on windows when thread is not joinable
Change-Id: I1f8c8136e45b92a4143b802ea09257da2eec6a89
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 402d78ffafeb..7bb7286af8ca 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1752,7 +1752,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())-> |