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

Tor Lillqvist tml at collabora.com
Fri Sep 23 21:25:56 UTC 2016


 vcl/osx/salinst.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit e44b034512551c09689edcecfa7401ecbb4af80e
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sat Sep 24 00:13:45 2016 +0300

    tdf#102382: nextEventMatchingMask should only be called from the Main Thread
    
    So don't then unless we are on the main thread.
    
    Change-Id: I6ba52ed7db5d73a4c1c6acf10bdf254a6f959da8

diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 5cf3832..6fb7ca2 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -736,6 +736,9 @@ bool AquaSalInstance::AnyInput( VclInputFlags nType )
         }
     }
 
+    if (![NSThread isMainThread])
+        return false;
+
     unsigned/*NSUInteger*/ nEventMask = 0;
     if( nType & VclInputFlags::MOUSE)
         nEventMask |=


More information about the Libreoffice-commits mailing list