summaryrefslogtreecommitdiff
path: root/vcl/source
diff options
context:
space:
mode:
authorXisco Fauli <anistenis@gmail.com>2018-01-04 12:41:07 +0100
committerMichael Stahl <mstahl@redhat.com>2018-01-08 19:06:08 +0100
commit8fb6d980868bc08b1eef4c95bd820131c2b03640 (patch)
treea2ad44b861b6aa76dafd8fb4dd058060d0faa98f /vcl/source
parentca893ce3e4da351576e0d57caada57da190773f2 (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 'vcl/source')
-rw-r--r--vcl/source/window/msgbox.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index 67b3edf1df37..e45dfd0dee4f 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -433,6 +433,7 @@ OUString WarningBox::GetStandardText()
ErrorBox::ErrorBox( vcl::Window* pParent, const OUString& rMessage ) :
MessBox( pParent, MessBoxStyle::Ok | MessBoxStyle::DefaultOk, 0, OUString(), rMessage )
{
+ DBG_TESTSOLARMUTEX();
// Default Text is the display title from the application
if ( GetText().isEmpty() )
SetText( GetStandardText() );
@@ -450,6 +451,7 @@ ErrorBox::ErrorBox( vcl::Window* pParent, MessBoxStyle nStyle, WinBits nWinBits,
const OUString& rMessage ) :
MessBox( pParent, nStyle, nWinBits, OUString(), rMessage )
{
+ DBG_TESTSOLARMUTEX();
// Default Text is the display title from the application
if ( GetText().isEmpty() )
SetText( GetStandardText() );