diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2016-12-01 11:14:24 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2016-12-01 18:44:08 +0000 |
| commit | aa68c99d88fd7abe08c4aee5206c859a0cdba38e (patch) | |
| tree | 6bc2054a2d16799e1effe6e817455f4b8821843c /desktop | |
| parent | 0afbe8d5ca17c4e24bb49272dc6711925f82f5d5 (diff) | |
tdf#104126 - comphelper thread-pool, use reliable std::condition_variable.
The existing osl::Condition is an API and reliability disaster area.
Change-Id: I3be84e1c6a83e58c43c40c9c8720790d923a6694
Reviewed-on: https://gerrit.libreoffice.org/31163
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 501ebe1497ce..9a681584c59d 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -81,6 +81,7 @@ #include <toolkit/helper/vclunohelper.hxx> #include <comphelper/configuration.hxx> #include <comphelper/fileurl.hxx> +#include <comphelper/threadpool.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/backupfilehelper.hxx> #include <unotools/bootstrap.hxx> @@ -1791,11 +1792,14 @@ int Desktop::doShutdown() StarBASIC::DetachAllDocBasicItems(); #endif } + // be sure that path/language options gets destroyed before // UCB is deinitialized pExecGlobals->pLanguageOptions.reset( nullptr ); pExecGlobals->pPathOptions.reset( nullptr ); + comphelper::ThreadPool::getSharedOptimalPool().shutdown(); + bool bRR = pExecGlobals->bRestartRequested; delete pExecGlobals; pExecGlobals = nullptr; |