summaryrefslogtreecommitdiff
path: root/apps/gui
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2007-09-05 03:06:49 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2007-09-05 03:06:49 +0000
commit24006ffeacdd6430ec71bad3ae09a27343a4053e (patch)
tree2c82355b2eeb8e8771a36e53b7607c9bd28b1ce8 /apps/gui
parent19d141a3eb3200a1d406452351092e0e81a4efd3 (diff)
downloadrockbox-24006ffeacdd6430ec71bad3ae09a27343a4053e.tar.gz
rockbox-24006ffeacdd6430ec71bad3ae09a27343a4053e.zip
stop non-live settings from beign accepted even if cancel was chosen
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14616 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
-rw-r--r--apps/gui/option_select.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c
index 1a45f2f6ae..7752b35085 100644
--- a/apps/gui/option_select.c
+++ b/apps/gui/option_select.c
@@ -433,7 +433,7 @@ bool option_screen(struct settings_list *setting,
433 function(*variable); 433 function(*variable);
434 } 434 }
435 435
436 if (oldvalue != *variable) 436 if (oldvalue != *variable && (action != ACTION_STD_CANCEL))
437 { 437 {
438 if (use_temp_var) 438 if (use_temp_var)
439 { 439 {