From 4894e2134f214b742ac3a08b90b057c66059d9af Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Mon, 14 Jul 2014 03:39:26 +0200 Subject: [PATCH] (Apple/OSX) Get rid of 'runCore' function --- apple/OSX/platform.m | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/apple/OSX/platform.m b/apple/OSX/platform.m index c7d2e92f44..a87cebc957 100644 --- a/apple/OSX/platform.m +++ b/apple/OSX/platform.m @@ -249,17 +249,6 @@ static char** waiting_argv; [[NSApplication sharedApplication] runModalForWindow:panel]; } -// This utility function will queue the self.core and self.file instance values for running. -- (void)runCore -{ - _wantReload = g_extern.main_is_init; - - if (!g_extern.main_is_init) - apple_run_core(self.core, self.file.UTF8String); - else - g_extern.system.shutdown = true; -} - - (void)chooseCore { [[NSApplication sharedApplication] beginSheet:self.coreSelectSheet modalForWindow:self.window modalDelegate:nil didEndSelector:nil contextInfo:nil]; @@ -283,7 +272,12 @@ static char** waiting_argv; self.core = objc_getAssociatedObject(cb.objectValueOfSelectedItem, associated_core_key); #endif - [self runCore]; + _wantReload = g_extern.main_is_init; + + if (!g_extern.main_is_init) + apple_run_core(self.core, self.file.UTF8String); + else + g_extern.system.shutdown = true; } #pragma mark RetroArch_Platform