From 76233f89598b0aeb7af947c7c1d38bdacb7e9b69 Mon Sep 17 00:00:00 2001 From: LibretroAdmin Date: Tue, 11 Feb 2025 12:44:03 +0100 Subject: [PATCH] on/off labels no longer cached - language switches now immediately change the on/off labels as well - and binary size is smaller --- menu/menu_setting.c | 8 ++------ setting_list.h | 5 ----- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 821272b9ad9..2c064dbe2fa 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -1234,8 +1234,8 @@ static void setting_get_string_representation_st_bool(rarch_setting_t *setting, { if (setting) strlcpy(s, *setting->value.target.boolean - ? setting->boolean.on_label - : setting->boolean.off_label, + ? msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ON) + : msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF), len); } @@ -2062,8 +2062,6 @@ static rarch_setting_t setting_bool_setting(const char* name, result.value.target.boolean = target; result.original_value.boolean = *target; result.default_value.boolean = default_value; - result.boolean.off_label = off; - result.boolean.on_label = on; result.cmd_trigger_idx = CMD_EVENT_NONE; @@ -24705,8 +24703,6 @@ void menu_setting_free(rarch_setting_t *setting) (*&list)[pos].original_value.fraction = 0.0f; \ (*&list)[pos].dir.empty_path = NULL; \ (*&list)[pos].cmd_trigger_idx = CMD_EVENT_NONE; \ - (*&list)[pos].boolean.off_label = NULL; \ - (*&list)[pos].boolean.on_label = NULL; \ } static rarch_setting_t *menu_setting_new_internal(rarch_setting_info_t *list_info) diff --git a/setting_list.h b/setting_list.h index 40f467ca237..4933b0289d8 100644 --- a/setting_list.h +++ b/setting_list.h @@ -120,11 +120,6 @@ struct rarch_setting float min; float max; struct - { - const char *off_label; - const char *on_label; - } boolean; - struct { const char *empty_path; } dir;