From bf03395040fd54ce3bae5b7c4c9bfde633f72320 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 18 May 2019 08:00:21 +0200 Subject: [PATCH] Cleanups --- menu/menu_setting.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 4efbb1f86e..7031882356 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -5136,11 +5136,13 @@ rarch_setting_t *menu_setting_find(const char *label) { rarch_setting_t *setting = NULL; - menu_entries_ctl(MENU_ENTRIES_CTL_SETTINGS_GET, &setting); - - if (!setting || !label) + if (!label) return NULL; + menu_entries_ctl(MENU_ENTRIES_CTL_SETTINGS_GET, &setting); + + if (!setting) + return NULL; return menu_setting_find_internal(setting, label); } @@ -5148,11 +5150,13 @@ rarch_setting_t *menu_setting_find_enum(enum msg_hash_enums enum_idx) { rarch_setting_t *setting = NULL; - menu_entries_ctl(MENU_ENTRIES_CTL_SETTINGS_GET, &setting); - - if (!setting || enum_idx == 0) + if (enum_idx == 0) return NULL; + menu_entries_ctl(MENU_ENTRIES_CTL_SETTINGS_GET, &setting); + + if (!setting) + return NULL; return menu_setting_find_internal_enum(setting, enum_idx); }