[Libreoffice-commits] core.git: vcl/source

Noel Grandin noel.grandin at collabora.co.uk
Mon Dec 12 10:02:36 UTC 2016


 vcl/source/window/event.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 71b1e3ff6374c23e65200d3bcafca387d29af04f
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Mon Dec 12 09:47:51 2016 +0200

    tdf#104573 - Assertion failed: SolarMutex not locked when trying
    
    to bring up File Open... dialog
    
    we need to hold the SolarMutex when doing VclPtr ref-counting
    
    Change-Id: I843f2a243acaf73db1f6557df23475fe5bb12131
    Reviewed-on: https://gerrit.libreoffice.org/31892
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx
index e8bb662..38815a3 100644
--- a/vcl/source/window/event.cxx
+++ b/vcl/source/window/event.cxx
@@ -652,6 +652,7 @@ void Window::ImplCallFocusChangeActivate( vcl::Window* pNewOverlapWindow,
 NotifyEvent::NotifyEvent( MouseNotifyEvent nEventType, vcl::Window* pWindow,
                           const void* pEvent )
 {
+    SolarMutexGuard aVclGuard;
     mpWindow    = pWindow;
     mpData      = const_cast<void*>(pEvent);
     mnEventType  = nEventType;


More information about the Libreoffice-commits mailing list