[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - vcl/win

[Libreoffice Gerrit user]

 vcl/win/window/salframe.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 885f99d1d926fa08f58117573717f98eb0de139c
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Mon Nov 5 09:02:56 2018 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Tue Nov 6 09:58:58 2018 +0100

    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 at fbihome.de>
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    (cherry picked from commit 212ea275f21251903e449ba5a6b7c4fc2dc57642)
    Reviewed-on: https://gerrit.libreoffice.org/62930
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

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
             {