1
0
Fork 0
forked from len0rd/rockbox

Merge r18419 and r18421 from trunk:

Fix the bug reported in FS#9350: the WPS would crash on %mm or %cf if they weren't in conditionals, and make %mm 0-based again (as described in CustomWPS) and change %cf accordingly.


git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_0@18427 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Nicolas Pennequin 2008-09-05 22:53:03 +00:00
parent d74b737d63
commit 40f591a026

View file

@ -1138,12 +1138,12 @@ static char *get_token_value(struct gui_wps *gwps,
case WPS_TOKEN_REPEAT_MODE:
if (intval)
*intval = global_settings.repeat_mode + 1;
snprintf(buf, buf_size, "%d", *intval);
snprintf(buf, buf_size, "%d", global_settings.repeat_mode);
return buf;
case WPS_TOKEN_RTC_12HOUR_CFG:
if (intval)
*intval = global_settings.timeformat + 1;
snprintf(buf, buf_size, "%d", *intval);
snprintf(buf, buf_size, "%d", global_settings.timeformat);
return buf;
#if CONFIG_RTC
case WPS_TOKEN_RTC_DAY_OF_MONTH: