From e40ebccbddbddf3d438098f77a127f3d42ebc1d9 Mon Sep 17 00:00:00 2001 From: radius Date: Wed, 30 Aug 2017 21:42:29 -0500 Subject: [PATCH] make the verbosity toggle less weird: right now, enabling verbosity via -v causes it to change the config parameter. Now it doesn't changet the config parameter unless the switch is actually flicked manually --- configuration.c | 7 +++++-- menu/menu_setting.c | 12 ++---------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/configuration.c b/configuration.c index cf37d12a05..05197310d1 100644 --- a/configuration.c +++ b/configuration.c @@ -3567,8 +3567,11 @@ bool config_save_file(const char *path) } #endif - config_set_bool(conf, "log_verbosity", - verbosity_is_enabled()); + if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_VERBOSITY, NULL)) + { + config_set_bool(conf, "log_verbosity", + verbosity_is_enabled()); + } config_set_bool(conf, "perfcnt_enable", rarch_ctl(RARCH_CTL_IS_PERFCNT_ENABLE, NULL)); diff --git a/menu/menu_setting.c b/menu/menu_setting.c index d41698c3ab..5005fbdc40 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -1697,19 +1697,11 @@ void general_write_handler(void *data) settings->uints.input_joypad_map[4] = *setting->value.target.integer; break; case MENU_ENUM_LABEL_LOG_VERBOSITY: - if (setting - && setting->value.target.boolean - && *setting->value.target.boolean) + if (!verbosity_is_enabled()) verbosity_enable(); else verbosity_disable(); - - if (setting - && setting->value.target.boolean - && *setting->value.target.boolean) - retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_VERBOSITY, NULL); - else - retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_VERBOSITY, NULL); + retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_VERBOSITY, NULL); break; case MENU_ENUM_LABEL_VIDEO_SMOOTH: video_driver_set_filtering(1, settings->bools.video_smooth);