Merge pull request #5386 from fr500/master

make the verbosity toggle less weird:
This commit is contained in:
Twinaphex 2017-08-31 11:50:48 +02:00 committed by GitHub
commit 652b0aa940
2 changed files with 7 additions and 12 deletions

View File

@ -3566,8 +3566,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));

View File

@ -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);