From d9e8d4439364945e081a6b76b8bdd47987fe718c Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 15 Mar 2021 07:22:23 +0100 Subject: [PATCH] menu_displaylist_parse_settings_enum - cleanups --- menu/menu_displaylist.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index ff5258315e..d969a44750 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -2259,23 +2259,25 @@ int menu_displaylist_parse_settings_enum( ST_NONE, /* PARSE_SUB_GROUP */ ST_SIZE, /* PARSE_ONLY_SIZE */ }; + uint64_t flags; enum setting_type precond = precond_lut[parse_type]; size_t count = 0; - settings_t *settings = config_get_ptr(); - bool show_advanced_settings = settings->bools.menu_show_advanced_settings; if (!setting) return -1; - if (!show_advanced_settings) - { - uint64_t flags = setting->flags; - if (flags & SD_FLAG_ADVANCED) - goto end; + flags = setting->flags; + #ifdef HAVE_LAKKA - if (flags & SD_FLAG_LAKKA_ADVANCED) - goto end; + if (flags & (SD_FLAG_ADVANCED | SD_FLAG_LAKKA_ADVANCED)) +#else + if (flags & (SD_FLAG_ADVANCED)) #endif + { + settings_t *settings = config_get_ptr(); + bool show_advanced_settings = settings->bools.menu_show_advanced_settings; + if (!show_advanced_settings) + goto end; } for (;;)