From 0ddd15c1134dde249552ebe763c1cd005e8b4591 Mon Sep 17 00:00:00 2001 From: Xisco Fauli Date: Thu, 4 Jan 2018 12:41:07 +0100 Subject: 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 Reviewed-by: Noel Grandin --- cui/source/options/personalization.cxx | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'cui/source') 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() ); -- cgit v1.2.3