mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 13:20:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

(OSX platform) Make code more robust

Browse Source
This commit is contained in:
neville 2015-03-29 18:17:29 +02:00
parent c9b4aa2622
commit 02eca41ea1
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apple/OSX/platform.m
View File

@ -268,8 +268,10 @@ static void poll_iteration(void)
{ {
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
NSString *__core = [filenames objectAtIndex:0]; NSString *__core = [filenames objectAtIndex:0];
const char *core_name = global->menu.info.library_name; const char *core_name = global ? global->menu.info.library_name : NULL;
strlcpy(global->fullpath, __core.UTF8String, sizeof(global->fullpath));
if (global)
strlcpy(global->fullpath, __core.UTF8String, sizeof(global->fullpath));
if (core_name) if (core_name)
rarch_main_command(RARCH_CMD_LOAD_CONTENT); rarch_main_command(RARCH_CMD_LOAD_CONTENT);
@ -298,8 +300,10 @@ static void poll_iteration(void)
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
NSURL *url = (NSURL*)panel.URL; NSURL *url = (NSURL*)panel.URL;
NSString *__core = url.path; NSString *__core = url.path;
const char *core_name = global->menu.info.library_name; const char *core_name = global ? global->menu.info.library_name : NULL;
strlcpy(global->fullpath, __core.UTF8String, sizeof(global->fullpath));
if (global)
strlcpy(global->fullpath, __core.UTF8String, sizeof(global->fullpath));
if (core_name) if (core_name)
rarch_main_command(RARCH_CMD_LOAD_CONTENT); rarch_main_command(RARCH_CMD_LOAD_CONTENT);
@ -328,7 +332,7 @@ static void poll_iteration(void)
[[NSApplication sharedApplication] endSheet:self.coreSelectSheet returnCode:0]; [[NSApplication sharedApplication] endSheet:self.coreSelectSheet returnCode:0];
[self.coreSelectSheet orderOut:self]; [self.coreSelectSheet orderOut:self];
if (global->system.shutdown) if (global && global->system.shutdown)
return; return;
/* TODO - rewrite this. */ /* TODO - rewrite this. */
@ -339,7 +343,7 @@ static void poll_iteration(void)
self.core = objc_getAssociatedObject(cb.objectValueOfSelectedItem, associated_core_key); self.core = objc_getAssociatedObject(cb.objectValueOfSelectedItem, associated_core_key);
#endif #endif
if (!global->main_is_init) if (global && !global->main_is_init)
{ {
/* TODO/FIXME: Set core/content here. */ /* TODO/FIXME: Set core/content here. */
rarch_main_command(RARCH_CMD_LOAD_CORE); rarch_main_command(RARCH_CMD_LOAD_CORE);