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

(OSX) Fix IBAction openCores

Browse Source
This commit is contained in:
Twinaphex 2015-07-18 19:24:14 +02:00
parent 0961446b19
commit 8bf42618d9
1 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
ui/drivers/ui_cocoa.m
View File

@ -268,34 +268,40 @@ static void poll_iteration(void)
} }
} }
- (IBAction)openCore:(id)sender - (IBAction)openCore:(id)sender {
{ NSOpenPanel* panel = (NSOpenPanel*)[NSOpenPanel openPanel];
NSOpenPanel* panel = (NSOpenPanel*)[NSOpenPanel openPanel];
#if defined(MAC_OS_X_VERSION_10_6) #if defined(MAC_OS_X_VERSION_10_6)
[panel beginSheetModalForWindow:self.window completionHandler:^(NSInteger result) [panel beginSheetModalForWindow:self.window completionHandler:^(NSInteger result)
{ {
[[NSApplication sharedApplication] stopModal]; [[NSApplication sharedApplication] stopModal];
if (result == NSOKButton && panel.URL) if (result == NSOKButton && panel.URL)
{
settings_t *settings = config_get_ptr();
NSURL *url = (NSURL*)panel.URL;
NSString *__core = url.path;
const char *core_name = settings->libretro_directory;
if (core_name)
{ {
strlcpy(settings->libretro_directory, __core.UTF8String, sizeof(settings->libretro_directory)); menu_handle_t *menu = menu_driver_get_ptr();
ui_companion_event_command(EVENT_CMD_LOAD_CORE); global_t *global = global_get_ptr();
settings_t *settings = config_get_ptr();
NSURL *url = (NSURL*)panel.URL;
NSString *__core = url.path;
if (__core)
{
strlcpy(settings->libretro, __core.UTF8String, sizeof(settings->libretro));
ui_companion_event_command(EVENT_CMD_LOAD_CORE);
if (menu->load_no_content && settings->core.set_supports_no_game_enable)
{
*global->fullpath = '\0';
menu_common_load_content(false, CORE_TYPE_PLAIN);
}
}
else
[self performSelector:@selector(chooseCore) withObject:nil afterDelay:.5f];
} }
else }];
[self performSelector:@selector(chooseCore) withObject:nil afterDelay:.5f];
}
}];
#else #else
[panel beginSheetForDirectory:nil file:nil modalForWindopw:[self window] modalDelegate:self didEndSelector:@selector(didEndSaveSheet:returnCode:contextInfo:) contextInfo:NULL]; [panel beginSheetForDirectory:nil file:nil modalForWindopw:[self window] modalDelegate:self didEndSelector:@selector(didEndSaveSheet:returnCode:contextInfo:) contextInfo:NULL];
#endif #endif
[[NSApplication sharedApplication] runModalForWindow:panel]; [[NSApplication sharedApplication] runModalForWindow:panel];
} }
- (void)openDocument:(id)sender - (void)openDocument:(id)sender