ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Attempt to prevent race issue in get_chosen_screen

This commit is contained in:
Twinaphex 2016-01-15 13:58:16 +01:00
parent 26bcfa8d89
commit 58ebbdeada
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gfx/drivers_context/cocoa_gl_ctx.m
View File

@ -126,7 +126,11 @@ void *get_chosen_screen(void)
return [RAScreen mainScreen]; return [RAScreen mainScreen];
#else #else
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
if (settings->video.monitor_index >= RAScreen.screens.count) NSArray *screens = [RAScreen screens];
if (!screens)
return NULL;
if (settings->video.monitor_index >= screens.count)
{ {
RARCH_WARN("video_monitor_index is greater than the number of connected monitors; using main screen instead.\n"); RARCH_WARN("video_monitor_index is greater than the number of connected monitors; using main screen instead.\n");
#if __has_feature(objc_arc) #if __has_feature(objc_arc)
@ -136,7 +140,6 @@ void *get_chosen_screen(void)
#endif #endif
} }
NSArray *screens = [RAScreen screens];
#if __has_feature(objc_arc) #if __has_feature(objc_arc)
return ((__bridge void*)[screens objectAtIndex:settings->video.monitor_index]); return ((__bridge void*)[screens objectAtIndex:settings->video.monitor_index]);
#else #else