From ec28aca278fd34c9cd1284def3fa9b269d26be80 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 22 Jul 2014 04:40:35 +0200 Subject: [PATCH] Cleanup menu_replace_config --- frontend/menu/backend/menu_common_backend.c | 2 +- frontend/menu/menu_common.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/frontend/menu/backend/menu_common_backend.c b/frontend/menu/backend/menu_common_backend.c index 27fc38e4b4..f4fa080a11 100644 --- a/frontend/menu/backend/menu_common_backend.c +++ b/frontend/menu/backend/menu_common_backend.c @@ -2634,7 +2634,7 @@ static int menu_common_iterate(unsigned action) } // Core selection on non-console just updates directory listing. - // Will take affect on new ROM load. + // Will take effect on new ROM load. #elif defined(RARCH_CONSOLE) #if defined(GEKKO) && defined(HW_RVL) fill_pathname_join(g_extern.fullpath, g_defaults.core_dir, diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c index 347e1a8c54..f12a6161b2 100644 --- a/frontend/menu/menu_common.c +++ b/frontend/menu/menu_common.c @@ -578,9 +578,6 @@ bool menu_iterate(void) // This should mitigate most of the smaller bugs. bool menu_replace_config(const char *path) { - if (!driver.menu) - return false; - if (strcmp(path, g_extern.config_path) == 0) return false; @@ -594,7 +591,9 @@ bool menu_replace_config(const char *path) *g_extern.fullpath = '\0'; *g_settings.libretro = '\0'; // Load core in new config. g_extern.lifecycle_state |= (1ULL << MODE_LOAD_GAME); - driver.menu->load_no_rom = false; + + if (driver.menu) + driver.menu->load_no_rom = false; return true; }