diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-06-13 12:59:09 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-08-23 21:52:45 +0200 |
| commit | c25bc0c046d176eb4221dc2acb42563b62eb9454 (patch) | |
| tree | 8c1d90547a6af46b5bd272cccab558f364e671b9 /desktop/source | |
| parent | 2a5c998d4cdfd54ba65b93318292dab542beaabd (diff) | |
make joinThreadsIfIdle return false if it cannot join
Change-Id: I52e22bf5e68809d6787d2d135b6a35384cf79391
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168785
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
(cherry picked from commit c7ff8768db58aaee5ce0acbabe97faeaf450f017)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172329
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'desktop/source')
| -rw-r--r-- | desktop/source/lib/init.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index f06cffe5eaae..1a9fc79e621d 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -3441,7 +3441,8 @@ static void lo_stopURP(LibreOfficeKit* /* pThis */, static int lo_joinThreads(LibreOfficeKit* /* pThis */) { comphelper::ThreadPool &pool = comphelper::ThreadPool::getSharedOptimalPool(); - pool.joinThreadsIfIdle(); + if (!pool.joinThreadsIfIdle()) + return 0; // Grammar checker thread css::uno::Reference<css::linguistic2::XLinguServiceManager2> xLangSrv = |