summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2007-03-31 12:37:03 +0000
committerJens Arnold <amiconn@rockbox.org>2007-03-31 12:37:03 +0000
commit81625742c934c895958b91ee197b505a05c4c53c (patch)
tree29fc92afd7486a92138f40407dab92a0f44091af /apps
parent54ea2e435e1a5688de4e4dcf551a1fc9c1db323f (diff)
downloadrockbox-81625742c934c895958b91ee197b505a05c4c53c.tar.gz
rockbox-81625742c934c895958b91ee197b505a05c4c53c.zip
Player: Fix setting integer values to their min/max values.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12980 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/settings.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/settings.c b/apps/settings.c
index 57db619d72..0206b97d14 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -1218,6 +1218,7 @@ bool set_int_ex(const unsigned char* string,
1218 void (*formatter)(char*, int, int, const char*), 1218 void (*formatter)(char*, int, int, const char*),
1219 long (*get_talk_id)(int)) 1219 long (*get_talk_id)(int))
1220{ 1220{
1221 int count = (max-min)/step + 1;
1221#if CONFIG_KEYPAD != PLAYER_PAD 1222#if CONFIG_KEYPAD != PLAYER_PAD
1222 struct value_setting_data data = { 1223 struct value_setting_data data = {
1223 INT,max, step, voice_unit,unit,formatter,get_talk_id,NULL }; 1224 INT,max, step, voice_unit,unit,formatter,get_talk_id,NULL };
@@ -1225,10 +1226,9 @@ bool set_int_ex(const unsigned char* string,
1225 data.unit = unit_strings[voice_unit]; 1226 data.unit = unit_strings[voice_unit];
1226 else 1227 else
1227 data.unit = str(voice_unit); 1228 data.unit = str(voice_unit);
1228 return do_set_setting(string,variable,(max-min)/step + 1, 1229 return do_set_setting(string,variable,count,
1229 (max-*variable)/step, &data,function); 1230 (max-*variable)/step, &data,function);
1230#else 1231#else
1231 int count = (max-min)/step + 1;
1232 struct value_setting_data data = { 1232 struct value_setting_data data = {
1233 INT,min, -step, voice_unit,unit,formatter,get_talk_id,NULL }; 1233 INT,min, -step, voice_unit,unit,formatter,get_talk_id,NULL };
1234 if (voice_unit < UNIT_LAST) 1234 if (voice_unit < UNIT_LAST)
@@ -1236,7 +1236,7 @@ bool set_int_ex(const unsigned char* string,
1236 else 1236 else
1237 data.unit = str(voice_unit); 1237 data.unit = str(voice_unit);
1238 return do_set_setting(string,variable,count, 1238 return do_set_setting(string,variable,count,
1239 count - ((max-*variable)/step), &data,function); 1239 (*variable-min)/step, &data,function);
1240#endif 1240#endif
1241} 1241}
1242bool set_int(const unsigned char* string, 1242bool set_int(const unsigned char* string,