From 5eed703d649361ab747b8e3fee1d58f73b4a6f72 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 15 Oct 2014 01:23:13 +0200 Subject: [PATCH] Cleanups --- frontend/menu/backend/menu_lakka_backend.c | 2 +- frontend/menu/menu_action.c | 13 ++++++++----- frontend/menu/menu_action.h | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/frontend/menu/backend/menu_lakka_backend.c b/frontend/menu/backend/menu_lakka_backend.c index 006324a7dd..d3a943ccb8 100644 --- a/frontend/menu/backend/menu_lakka_backend.c +++ b/frontend/menu/backend/menu_lakka_backend.c @@ -371,7 +371,7 @@ static int menu_lakka_iterate(unsigned action) if (setting->type == ST_BOOL) menu_action_setting_boolean(setting, action); else if (setting->type == ST_UINT) - menu_action_setting_unsigned_integer(setting, 0, action); + menu_action_setting_unsigned_integer(setting, action); else if (setting->type == ST_FLOAT) menu_action_setting_fraction(setting, action); else if (setting->type == ST_STRING) diff --git a/frontend/menu/menu_action.c b/frontend/menu/menu_action.c index 326c77fe41..ce6f5d76ab 100644 --- a/frontend/menu/menu_action.c +++ b/frontend/menu/menu_action.c @@ -46,7 +46,7 @@ int menu_action_setting_boolean( } int menu_action_setting_unsigned_integer( - rarch_setting_t *setting, unsigned type, unsigned action) + rarch_setting_t *setting, unsigned action) { if (setting->action_ok) setting->action_ok(setting, action); @@ -145,12 +145,15 @@ static int menu_entries_set_current_path_selection( } static int menu_action_handle_setting(rarch_setting_t *setting, - unsigned type, const char *label, unsigned action) + unsigned type, unsigned action) { + if (!setting) + return -1; + if (setting->type == ST_BOOL) return menu_action_setting_boolean(setting, action); if (setting->type == ST_UINT) - return menu_action_setting_unsigned_integer(setting, type, action); + return menu_action_setting_unsigned_integer(setting, action); if (setting->type == ST_FLOAT) return menu_action_setting_fraction(setting, action); if (setting->type == ST_PATH) @@ -291,7 +294,7 @@ int menu_action_setting_set(unsigned type, const char *label, driver.menu->list_settings, list->list[driver.menu->selection_ptr].label); if (setting) - return menu_action_handle_setting(setting, type, label, action); + return menu_action_handle_setting(setting, type, action); /* Check if setting belongs to main menu. */ @@ -299,7 +302,7 @@ int menu_action_setting_set(unsigned type, const char *label, driver.menu->list_mainmenu, list->list[driver.menu->selection_ptr].label); if (setting) - return menu_action_handle_setting(setting, type, label, action); + return menu_action_handle_setting(setting, type, action); /* Fallback. */ diff --git a/frontend/menu/menu_action.h b/frontend/menu/menu_action.h index 1e6c9ef589..05303a24ee 100644 --- a/frontend/menu/menu_action.h +++ b/frontend/menu/menu_action.h @@ -32,7 +32,7 @@ int menu_action_setting_fraction( rarch_setting_t *setting, unsigned action); int menu_action_setting_unsigned_integer( - rarch_setting_t *setting, unsigned type, unsigned action); + rarch_setting_t *setting, unsigned action); void menu_action_setting_driver( rarch_setting_t *setting, unsigned action);