summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2018-11-05 09:02:56 +0100
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2018-11-06 09:58:58 +0100
commit885f99d1d926fa08f58117573717f98eb0de139c (patch)
treecc1217373d33065fdb92ef7862d0c8a633f0ff2a /vcl
parentb77f4f69bb2f1d3ab740446799da2fd3db9094da (diff)
tdf#118573: Acquire solar mutex when calling Application::Reschedule
Change-Id: I252973ad5902738c2bb684f6bb70bc4c46500bae Reviewed-on: https://gerrit.libreoffice.org/62873 Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 212ea275f21251903e449ba5a6b7c4fc2dc57642) Reviewed-on: https://gerrit.libreoffice.org/62930 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/win/window/salframe.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index e67aa6af90e6..8b0a64232927 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -5692,7 +5692,10 @@ LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lP
// messages in the message queue and dispatch them before we return control to the system.
if ( nRet )
+ {
+ SolarMutexGuard aGuard;
while ( Application::Reschedule( true ) );
+ }
}
else
{