diff options
| author | Xisco Fauli <anistenis@gmail.com> | 2018-01-04 12:41:07 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2018-01-08 19:06:08 +0100 |
| commit | 8fb6d980868bc08b1eef4c95bd820131c2b03640 (patch) | |
| tree | a2ad44b861b6aa76dafd8fb4dd058060d0faa98f /cui | |
| parent | ca893ce3e4da351576e0d57caada57da190773f2 (diff) | |
tdf#114818 hold the mutex before executing the error dialog
Also add an assert to ErrorBox to ensure the mutex is acquired
Change-Id: I3e426024dad6ddfc5cffc7861b0cba9e8989c018
Reviewed-on: https://gerrit.libreoffice.org/47388
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit 0ddd15c1134dde249552ebe763c1cd005e8b4591)
Reviewed-on: https://gerrit.libreoffice.org/47570
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/options/personalization.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx index d18d56b06fb6..c75a78c8ef2e 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -702,6 +702,7 @@ void SearchAndParseThread::execute() { // in case of a returned CommandFailedException // SimpleFileAccess serves it, returning an empty stream + SolarMutexGuard aGuard; sError = CuiResId(RID_SVXSTR_SEARCHERROR); sError = sError.replaceAll("%1", m_aURL); m_pPersonaDialog->SetProgress( OUString() ); @@ -714,6 +715,7 @@ void SearchAndParseThread::execute() { // a catch all clause, in case the exception is not // served elsewhere + SolarMutexGuard aGuard; sError = CuiResId(RID_SVXSTR_SEARCHERROR); sError = sError.replaceAll("%1", m_aURL); m_pPersonaDialog->SetProgress( OUString() ); @@ -754,6 +756,7 @@ void SearchAndParseThread::execute() { if( m_bDirectURL ) { + SolarMutexGuard aGuard; sError = CuiResId(RID_SVXSTR_SEARCHERROR); sError = sError.replaceAll("%1", m_aURL); m_pPersonaDialog->SetProgress( OUString() ); @@ -837,6 +840,7 @@ void SearchAndParseThread::execute() } catch ( const uno::Exception & ) { + SolarMutexGuard aGuard; sError = CuiResId( RID_SVXSTR_SEARCHERROR ); sError = sError.replaceAll("%1", m_aURL); m_pPersonaDialog->SetProgress( OUString() ); |