Cleanup menu_replace_config

This commit is contained in:
twinaphex 2014-07-22 04:40:35 +02:00
parent 47de32450d
commit ec28aca278
2 changed files with 4 additions and 5 deletions

View File

@ -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,

View File

@ -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;
}