cui/source/options/personalization.cxx | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit 1dd48f927affcd394499bd945d2ce78f229471ee
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Sun Jul 10 12:23:10 2016 +0200
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.
Reviewed-on: https://gerrit.libreoffice.org/27087
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
(cherry picked from commit 4ebbb996ac159f57e0730c938667535af148cae1)
Change-Id: Iab4209776e1403a6520c106f3521476ee50848a4
Reviewed-on: https://gerrit.libreoffice.org/27183
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/cui/source/options/personalization.cxx
b/cui/source/options/personalization.cxx
index b752f30..55f04f6 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -107,6 +107,9 @@ SelectPersonaDialog::~SelectPersonaDialog()
void SelectPersonaDialog::dispose()
{
+ if (m_rSearchThread.is())
+ m_rSearchThread->join();
+
m_pEdit.clear();
m_pSearchButton.clear();
m_pProgressLabel.clear();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
