diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2008-07-15 14:25:16 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2008-07-15 14:25:16 +0000 |
commit | d3cb2aca444ab7006dba9379ee0fff1195a7baff (patch) | |
tree | aa805b2111c019a96635a5d55ee25f9782e6a2de /apps/gui | |
parent | c893affeefa35975c916a222d20a989f31555646 (diff) | |
download | rockbox-d3cb2aca444ab7006dba9379ee0fff1195a7baff.tar.gz rockbox-d3cb2aca444ab7006dba9379ee0fff1195a7baff.zip |
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
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/option_select.c | 10 |
1 files changed, 6 insertions, 4 deletions
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, | |||
526 | continue; | 526 | continue; |
527 | else if (action == ACTION_STD_CANCEL) | 527 | else if (action == ACTION_STD_CANCEL) |
528 | { | 528 | { |
529 | bool show_cancel = false; | 529 | bool show_cancel = false, changed = false; |
530 | if (use_temp_var) | 530 | if (var_type == F_T_INT || var_type == F_T_UINT) |
531 | show_cancel = true; | ||
532 | else if (var_type == F_T_INT || var_type == F_T_UINT) | ||
533 | { | 531 | { |
534 | if (*variable != oldvalue) | 532 | if (*variable != oldvalue) |
535 | { | 533 | { |
536 | show_cancel = true; | 534 | show_cancel = true; |
537 | *variable = oldvalue; | 535 | *variable = oldvalue; |
536 | changed = true; | ||
538 | } | 537 | } |
539 | } | 538 | } |
540 | else | 539 | else |
@@ -545,8 +544,11 @@ bool option_screen(const struct settings_list *setting, | |||
545 | if (!use_temp_var) | 544 | if (!use_temp_var) |
546 | *(bool*)setting->setting = oldvalue==1?true:false; | 545 | *(bool*)setting->setting = oldvalue==1?true:false; |
547 | *variable = oldvalue; | 546 | *variable = oldvalue; |
547 | changed = true; | ||
548 | } | 548 | } |
549 | } | 549 | } |
550 | if (use_temp_var && changed) | ||
551 | show_cancel = true; | ||
550 | if (show_cancel) | 552 | if (show_cancel) |
551 | gui_syncsplash(HZ/2, ID2P(LANG_CANCEL)); | 553 | gui_syncsplash(HZ/2, ID2P(LANG_CANCEL)); |
552 | done = true; | 554 | done = true; |