ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(Menu) Get rid of defer_decision static functions

This commit is contained in:
twinaphex 2014-09-02 03:24:05 +02:00
parent 8a405fa611
commit 02ba4fc8af
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
frontend/menu/backend/menu_common_backend.c
View File

@ -536,23 +536,6 @@ static int menu_common_core_setting_toggle(unsigned setting, unsigned action)
return 0; return 0;
} }
static void defer_decision_automatic(void)
{
if (driver.menu)
{
menu_flush_stack_type(MENU_SETTINGS);
driver.menu->msg_force = true;
}
}
static void defer_decision_manual(void)
{
if (driver.menu)
menu_entries_push(driver.menu->menu_stack,
g_settings.libretro_directory, "deferred_core_list",
MENU_SETTINGS_DEFERRED_CORE, driver.menu->selection_ptr);
}
static int menu_common_setting_set_perf(unsigned setting, unsigned action, static int menu_common_setting_set_perf(unsigned setting, unsigned action,
struct retro_perf_counter **counters, unsigned offset) struct retro_perf_counter **counters, unsigned offset)
{ {
@ -2068,11 +2051,14 @@ static int menu_action_ok(const char *dir, unsigned menu_type)
if (ret == -1) if (ret == -1)
{ {
rarch_main_command(RARCH_CMD_LOAD_CORE); rarch_main_command(RARCH_CMD_LOAD_CORE);
defer_decision_automatic(); menu_flush_stack_type(MENU_SETTINGS);
driver.menu->msg_force = true;
return -1; return -1;
} }
else if (ret == 0) else if (ret == 0)
defer_decision_manual(); menu_entries_push(driver.menu->menu_stack,
g_settings.libretro_directory, "deferred_core_list",
MENU_SETTINGS_DEFERRED_CORE, driver.menu->selection_ptr);
} }
else else
{ {