diff options
author | Brandon Low <lostlogic@rockbox.org> | 2006-04-05 22:36:42 +0000 |
---|---|---|
committer | Brandon Low <lostlogic@rockbox.org> | 2006-04-05 22:36:42 +0000 |
commit | a69c495e5dd91b7404f92f4f44e773ef8cd59683 (patch) | |
tree | cdf7df205e42493172eff94fcecc0b2786d10e31 /apps/gui | |
parent | 51deb1d158cc6f136f7839b3a0657fc1b58162fc (diff) | |
download | rockbox-a69c495e5dd91b7404f92f4f44e773ef8cd59683.tar.gz rockbox-a69c495e5dd91b7404f92f4f44e773ef8cd59683.zip |
Patches from bug #5001 by Rani Hod, should make settings more resiliant to having 'off-step' values in a general way, but specifically fixes that bug report, and also round the current sleep timer value up when entering settings for sleep timer
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9527 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/option_select.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c index d482bd24ae..045f5570c4 100644 --- a/apps/gui/option_select.c +++ b/apps/gui/option_select.c | |||
@@ -78,13 +78,15 @@ void option_select_prev(struct option_select * opt) | |||
78 | { | 78 | { |
79 | if(opt->option - opt->step < opt->min_value) | 79 | if(opt->option - opt->step < opt->min_value) |
80 | { | 80 | { |
81 | if(!opt->limit_loop) | 81 | /* the dissimilarity to option_select_next() arises from the |
82 | { | 82 | * sleep timer problem (bug #5000 and #5001): |
83 | if(opt->option==opt->min_value) | 83 | * there we have min=0, step = 5 but the value itself might |
84 | opt->option=opt->max_value-1; | 84 | * not be a multiple of 5 -- as time elapsed; |
85 | else | 85 | * We need to be able to set timer to 0 (= Off) nevertheless. */ |
86 | opt->option=opt->min_value; | 86 | if(opt->option!=opt->min_value) |
87 | } | 87 | opt->option=opt->min_value; |
88 | else if(!opt->limit_loop) | ||
89 | opt->option=opt->max_value-1; | ||
88 | } | 90 | } |
89 | else | 91 | else |
90 | opt->option-=opt->step; | 92 | opt->option-=opt->step; |