From d3cb2aca444ab7006dba9379ee0fff1195a7baff Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Tue, 15 Jul 2008 14:25:16 +0000 Subject: dont show the "cancelled" splash if the setting wasnt changed (only affects settings which have the F_TEMPVAR flag set) git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18047 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/option_select.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'apps/gui/option_select.c') diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c index f6b15467a6..4b7ee60016 100644 --- a/apps/gui/option_select.c +++ b/apps/gui/option_select.c @@ -526,15 +526,14 @@ bool option_screen(const struct settings_list *setting, continue; else if (action == ACTION_STD_CANCEL) { - bool show_cancel = false; - if (use_temp_var) - show_cancel = true; - else if (var_type == F_T_INT || var_type == F_T_UINT) + bool show_cancel = false, changed = false; + if (var_type == F_T_INT || var_type == F_T_UINT) { if (*variable != oldvalue) { show_cancel = true; *variable = oldvalue; + changed = true; } } else @@ -545,8 +544,11 @@ bool option_screen(const struct settings_list *setting, if (!use_temp_var) *(bool*)setting->setting = oldvalue==1?true:false; *variable = oldvalue; + changed = true; } } + if (use_temp_var && changed) + show_cancel = true; if (show_cancel) gui_syncsplash(HZ/2, ID2P(LANG_CANCEL)); done = true; -- cgit v1.2.3