summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2016-09-24 00:13:45 +0300
committerTor Lillqvist <tml@collabora.com>2016-11-13 20:57:09 +0200
commit83adc9c35c74e0badc710d981405858b1179a327 (patch)
tree54b23d472f69af79c0b1afda9244345a4c3764f4
parente4fc5f4084ec3c06054080c7d741293650e36fb3 (diff)
tdf#102382: nextEventMatchingMask should only be called from the Main Threaddistro/collabora/lov-5.2
So don't then unless we are on the main thread. Change-Id: I6ba52ed7db5d73a4c1c6acf10bdf254a6f959da8
-rw-r--r--vcl/osx/salinst.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 3bbff247736d..9bb657040cd2 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 |=