diff options
| author | Miguel Borges de Freitas <92enen@gmail.com> | 2023-09-01 19:11:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-01 19:11:35 +0100 |
| commit | b6cbc52add16022213152b3fac522d8953a64855 (patch) | |
| tree | ebe424d41bc4f4abfbd6d7fe99d6abea7092f979 | |
| parent | efe703a063e10b8bbe0493c0c88b75805364c875 (diff) | |
| parent | 822740366aa6c6650056579b14bec1e5ba11a159 (diff) | |
| download | xbmc-b6cbc52add16022213152b3fac522d8953a64855.tar.xz | |
Merge pull request #23704 from enen92/sdl_crash
call -eventWithCGEvent: on the main queue
| -rw-r--r-- | xbmc/platform/darwin/osx/HotKeyController.m | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/xbmc/platform/darwin/osx/HotKeyController.m b/xbmc/platform/darwin/osx/HotKeyController.m index 423edb083d..378eeb7cdb 100644 --- a/xbmc/platform/darwin/osx/HotKeyController.m +++ b/xbmc/platform/darwin/osx/HotKeyController.m @@ -123,7 +123,10 @@ static CGEventRef tapEventCallback2(CGEventTapProxy proxy, CGEventType type, CGE if ((type != NX_SYSDEFINED) || (![hot_key_controller getActive])) return event; - NSEvent *nsEvent = [NSEvent eventWithCGEvent:event]; + NSEvent* __block nsEvent; + dispatch_sync(dispatch_get_main_queue(), ^{ + nsEvent = [NSEvent eventWithCGEvent:event]; + }); if (!nsEvent || [nsEvent subtype] != 8) return event; |