diff options
| author | Tor Lillqvist <tml@collabora.com> | 2016-09-24 00:13:45 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-10-13 23:34:24 +0300 |
| commit | 808e376c6664cae3b0a2d8e26be9fa11ad007e09 (patch) | |
| tree | 37967307a872044c446e887faa00c9947e79f489 /vcl | |
| parent | e07bc2fbf929f056dadbefe9f639fa5d40782662 (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 4bfe5bc6712e..ecc0aed85b1b 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 |= |