ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2025-01-25 18:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Main Thread Checker warning on macOS

Browse source 
Cache off NSWindow's windowNumber in SDL_WindowData on setup and use that in `Cocoa_SendWakeupEvent` to prevent accessing windowNumber off the main  thread.
This commit is contained in:
diddily 2022-07-26 13:30:59 -04:00 committed by Ryan C. Gordon
parent 31d38f2f30
commit 1f276a5148
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/video/cocoa/SDL_cocoaevents.m
View file

@ -549,13 +549,11 @@ Cocoa_PumpEvents(_THIS)
void Cocoa_SendWakeupEvent(_THIS, SDL_Window *window) void Cocoa_SendWakeupEvent(_THIS, SDL_Window *window)
{ @autoreleasepool { @autoreleasepool
{ {
NSWindow *nswindow = ((__bridge SDL_WindowData *) window->driverdata).nswindow;
NSEvent* event = [NSEvent otherEventWithType: NSEventTypeApplicationDefined NSEvent* event = [NSEvent otherEventWithType: NSEventTypeApplicationDefined
location: NSMakePoint(0,0) location: NSMakePoint(0,0)
modifierFlags: 0 modifierFlags: 0
timestamp: 0.0 timestamp: 0.0
windowNumber: nswindow.windowNumber windowNumber: ((__bridge SDL_WindowData *) window->driverdata).window_number
context: nil context: nil
subtype: 0 subtype: 0
data1: 0 data1: 0

1
src/video/cocoa/SDL_cocoawindow.h
View file

@ -126,6 +126,7 @@ typedef enum
@property (nonatomic) NSMutableArray *nscontexts; @property (nonatomic) NSMutableArray *nscontexts;
@property (nonatomic) SDL_bool created; @property (nonatomic) SDL_bool created;
@property (nonatomic) SDL_bool inWindowFullscreenTransition; @property (nonatomic) SDL_bool inWindowFullscreenTransition;
@property (nonatomic) NSInteger window_number;
@property (nonatomic) NSInteger flash_request; @property (nonatomic) NSInteger flash_request;
@property (nonatomic) Cocoa_WindowListener *listener; @property (nonatomic) Cocoa_WindowListener *listener;
@property (nonatomic) SDL_VideoData *videodata; @property (nonatomic) SDL_VideoData *videodata;

1
src/video/cocoa/SDL_cocoawindow.m
View file

@ -1615,6 +1615,7 @@ SetupWindowData(_THIS, SDL_Window * window, NSWindow *nswindow, NSView *nsview,
data.nswindow = nswindow; data.nswindow = nswindow;
data.created = created; data.created = created;
data.videodata = videodata; data.videodata = videodata;
data.window_number = nswindow.windowNumber;
data.nscontexts = [[NSMutableArray alloc] init]; data.nscontexts = [[NSMutableArray alloc] init];
data.sdlContentView = nsview; data.sdlContentView = nsview;