From 873f49b1f066f41ef0649647188708645e6c0663 Mon Sep 17 00:00:00 2001 From: William Wilgus Date: Tue, 29 Aug 2023 09:26:41 -0400 Subject: settings_list add F_CB_ONLY_IF_CHANGED for settings Recently I added F_CB_ON_SELECT_ONLY_IF_CHANGED in conjunction with the shuffle and repeat settings instead it makes more sense to make F_CB_ONLY_IF_CHANGED and apply to all callbacks (F_CB_ON_SELECT_ONLY or on_exit) Change-Id: I4376557d479aceb419f7b4b4e0998afc249c87ec --- apps/gui/option_select.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'apps/gui/option_select.c') diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c index d7f27f64eb..da6c703f40 100644 --- a/apps/gui/option_select.c +++ b/apps/gui/option_select.c @@ -472,7 +472,7 @@ bool option_screen(const struct settings_list *setting, bool cb_on_select_only = ((setting->flags & F_CB_ON_SELECT_ONLY) == F_CB_ON_SELECT_ONLY); bool cb_on_changed = - ((setting->flags & F_CB_ON_SELECT_ONLY_IF_CHANGED) == F_CB_ON_SELECT_ONLY_IF_CHANGED); + ((setting->flags & F_CB_ONLY_IF_CHANGED) == F_CB_ONLY_IF_CHANGED); int var_type = setting->flags&F_T_MASK; void (*function)(int) = NULL; @@ -578,8 +578,10 @@ bool option_screen(const struct settings_list *setting, } /* callback */ if (function && !cb_on_select_only) - function(*variable); - + { + if (!cb_on_changed || (*variable != oldvalue)) + function(*variable); + } /* if the volume is changing we need to let the skins know */ if (function == sound_get_fn(SOUND_VOLUME)) global_status.last_volume_change = current_tick; -- cgit v1.2.3