From 59d4cfcfd0f712882956c0706abd7b12de2b5b22 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 22 Apr 2015 23:15:19 +0200 Subject: [PATCH] Fix SET_SUPPORTS_NO_GAME cores --- command_event.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/command_event.c b/command_event.c index 144ab061af..8ca37f27a5 100644 --- a/command_event.c +++ b/command_event.c @@ -622,13 +622,12 @@ static void event_set_savestate_auto_index(void) static bool event_init_content(void) { - driver_t *driver = driver_get_ptr(); global_t *global = global_get_ptr(); /* No content to be loaded for dummy core, * just successfully exit. */ if (global->libretro_dummy) - goto end; + return true; if (!global->libretro_no_content) rarch_fill_pathnames(); @@ -648,16 +647,13 @@ static bool event_init_content(void) event_command(EVENT_CMD_BSV_MOVIE_INIT); event_command(EVENT_CMD_NETPLAY_INIT); -end: - retro_init_libretro_cbs(&driver->retro_ctx); - rarch_init_system_av_info(); - return true; } static bool event_init_core(void) { - global_t *global = global_get_ptr(); + global_t *global = global_get_ptr(); + driver_t *driver = driver_get_ptr(); settings_t *settings = config_get_ptr(); if(settings->auto_overrides_enable) @@ -682,6 +678,9 @@ static bool event_init_core(void) if (!event_init_content()) return false; + retro_init_libretro_cbs(&driver->retro_ctx); + rarch_init_system_av_info(); + return true; }