diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-07-10 12:23:10 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-07-13 09:23:04 +0000 |
| commit | 4ebbb996ac159f57e0730c938667535af148cae1 (patch) | |
| tree | 921b071a9f058c0bf77bfb492294a3a78b5ebea7 /cui | |
| parent | d31e13efa8eca0997f02bceadff659f06d4dc9a0 (diff) | |
make sure that the thread has joined before disposing UI elements
See e.g.
http://crashreport.libreoffice.org/stats/crash_details/80884848-16e7-4512-be4a-74c53bfce34b#allthreads
The thread can run while the UI elements have already been disposed. The
StopExecute call is not enough to prevent that from happening.
Change-Id: Iab4209776e1403a6520c106f3521476ee50848a4
Reviewed-on: https://gerrit.libreoffice.org/27087
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/options/personalization.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx index 53ce14fd5077..ad275efb5fb4 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -107,6 +107,9 @@ SelectPersonaDialog::~SelectPersonaDialog() void SelectPersonaDialog::dispose() { + if (m_pSearchThread.is()) + m_pSearchThread->join(); + m_pEdit.clear(); m_pSearchButton.clear(); m_pProgressLabel.clear(); |