diff options
| author | Tor Lillqvist <tml@collabora.com> | 2016-09-24 00:13:45 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-09-24 00:18:11 +0300 |
| commit | e44b034512551c09689edcecfa7401ecbb4af80e (patch) | |
| tree | 210c7b38df415a3d21f8e565c8af0738df638b1b /vcl | |
| parent | 41602324b00866b3c4f5f52759c8eb5ea8a1da0d (diff) | |
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
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/osx/salinst.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx index 5cf383272536..6fb7ca28bafe 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 |= |