diff --git a/frontend/menu/backend/menu_common_backend.c b/frontend/menu/backend/menu_common_backend.c index 7a4ce96640..45e9b45082 100644 --- a/frontend/menu/backend/menu_common_backend.c +++ b/frontend/menu/backend/menu_common_backend.c @@ -138,8 +138,16 @@ static void menu_common_entries_init(void *data, unsigned menu_type) case MENU_SETTINGS_GENERAL_OPTIONS: file_list_clear(menu->selection_buf); file_list_push(menu->selection_buf, "Libretro Logging Level", MENU_SETTINGS_LIBRETRO_LOG_LEVEL, 0); - file_list_push(menu->selection_buf, "Logging Verbosity", MENU_SETTINGS_LOGGING_VERBOSITY, 0); - file_list_push(menu->selection_buf, "Performance Counters", MENU_SETTINGS_PERFORMANCE_COUNTERS_ENABLE, 0); + if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "log_verbosity"))) + { + *current_setting->value.boolean = g_extern.verbose; + file_list_push(menu->selection_buf, current_setting->short_description, MENU_SETTINGS_LOGGING_VERBOSITY, 0); + } + if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "perfcnt_enable"))) + { + *current_setting->value.boolean = g_extern.perfcnt_enable; + file_list_push(menu->selection_buf, current_setting->short_description, MENU_SETTINGS_PERFORMANCE_COUNTERS_ENABLE, 0); + } if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "game_history_size"))) { *current_setting->value.unsigned_integer = g_settings.game_history_size; @@ -630,8 +638,11 @@ static void menu_common_entries_init(void *data, unsigned menu_type) file_list_push(menu->selection_buf, "Core Information", MENU_SETTINGS_CORE_INFO, 0); file_list_push(menu->selection_buf, "Settings", MENU_SETTINGS_OPTIONS, 0); - if (g_extern.perfcnt_enable) + if (g_extern.perfcnt_enable && (current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "rewind_enable"))) + { + *current_setting->value.boolean = g_extern.perfcnt_enable; file_list_push(menu->selection_buf, "Performance Counters", MENU_SETTINGS_PERFORMANCE_COUNTERS, 0); + } if (g_extern.main_is_init && !g_extern.libretro_dummy) { @@ -3695,8 +3706,8 @@ static int menu_common_setting_set(unsigned setting, unsigned action) g_settings.libretro_log_level++; break; case MENU_SETTINGS_LOGGING_VERBOSITY: - if (action == MENU_ACTION_LEFT || action == MENU_ACTION_RIGHT) - g_extern.verbose = !g_extern.verbose; + if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "log_verbosity"))) + menu_common_setting_set_current_boolean(current_setting, action); break; case MENU_SETTINGS_PERFORMANCE_COUNTERS_ENABLE: if (action == MENU_ACTION_LEFT || action == MENU_ACTION_RIGHT) diff --git a/settings_data.c b/settings_data.c index b0a04a897b..b7d3ff04ef 100644 --- a/settings_data.c +++ b/settings_data.c @@ -741,6 +741,10 @@ static void general_change_handler(const void *data) g_extern.netplay_is_client = *setting->value.boolean; else if (!strcmp(setting->name, "netplay_spectator_mode_enable")) g_extern.netplay_is_spectate = *setting->value.boolean; + else if (!strcmp(setting->name, "log_verbosity")) + g_extern.verbose = *setting->value.boolean; + else if (!strcmp(setting->name, "perfcnt_enable")) + g_extern.perfcnt_enable = *setting->value.boolean; } @@ -829,6 +833,8 @@ rarch_setting_t* setting_data_get_list(void) /*******************/ START_GROUP("General Options") START_SUB_GROUP("General Options") + CONFIG_BOOL(g_extern.verbose, "log_verbosity", "Logging Verbosity", false, GROUP_NAME, SUBGROUP_NAME, general_change_handler) + CONFIG_BOOL(g_extern.perfcnt_enable, "perfcnt_enable", "Performance Counters", false, GROUP_NAME, SUBGROUP_NAME, general_change_handler) CONFIG_BOOL(g_extern.config_save_on_exit, "config_save_on_exit", "Configuration Save On Exit", config_save_on_exit, GROUP_NAME, SUBGROUP_NAME, general_change_handler) CONFIG_BOOL(g_settings.fps_show, "fps_show", "Show Framerate", fps_show, GROUP_NAME, SUBGROUP_NAME, general_change_handler) CONFIG_BOOL(g_settings.rewind_enable, "rewind_enable", "Rewind", rewind_enable, GROUP_NAME, SUBGROUP_NAME, general_change_handler)