From 02ba4fc8af8e11b206d60f6be629d82e8e386d21 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 2 Sep 2014 03:24:05 +0200 Subject: [PATCH] (Menu) Get rid of defer_decision static functions --- frontend/menu/backend/menu_common_backend.c | 24 +++++---------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/frontend/menu/backend/menu_common_backend.c b/frontend/menu/backend/menu_common_backend.c index cd392fef09..401aebf630 100644 --- a/frontend/menu/backend/menu_common_backend.c +++ b/frontend/menu/backend/menu_common_backend.c @@ -536,23 +536,6 @@ static int menu_common_core_setting_toggle(unsigned setting, unsigned action) 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, 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) { rarch_main_command(RARCH_CMD_LOAD_CORE); - defer_decision_automatic(); + menu_flush_stack_type(MENU_SETTINGS); + driver.menu->msg_force = true; return -1; } 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 {