diff options
-rw-r--r-- | apps/menus/main_menu.c | 10 | ||||
-rw-r--r-- | docs/CREDITS | 1 |
2 files changed, 7 insertions, 4 deletions
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index 7c2e87c410..0278af3668 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c | |||
@@ -183,10 +183,12 @@ static char* info_getname(int selected_item, void *data, char *buffer) | |||
183 | case INFO_TIME: | 183 | case INFO_TIME: |
184 | tm = get_time(); | 184 | tm = get_time(); |
185 | snprintf(buffer, MAX_PATH, "%02d:%02d:%02d %s", | 185 | snprintf(buffer, MAX_PATH, "%02d:%02d:%02d %s", |
186 | global_settings.timeformat == 0 ? tm->tm_hour : tm->tm_hour-12, | 186 | global_settings.timeformat == 0 ? tm->tm_hour : |
187 | tm->tm_min, | 187 | ((tm->tm_hour + 11) % 12) + 1, |
188 | tm->tm_sec, | 188 | tm->tm_min, |
189 | global_settings.timeformat == 0 ? "" : tm->tm_hour>11 ? "P" : "A"); | 189 | tm->tm_sec, |
190 | global_settings.timeformat == 0 ? "" : | ||
191 | tm->tm_hour>11 ? "P" : "A"); | ||
190 | break; | 192 | break; |
191 | case INFO_DATE: | 193 | case INFO_DATE: |
192 | tm = get_time(); | 194 | tm = get_time(); |
diff --git a/docs/CREDITS b/docs/CREDITS index b371e5cf81..5bd1810a8e 100644 --- a/docs/CREDITS +++ b/docs/CREDITS | |||
@@ -383,6 +383,7 @@ Marcel Barbulescu | |||
383 | Phil Light | 383 | Phil Light |
384 | Rob Purchase | 384 | Rob Purchase |
385 | Andreas Müller | 385 | Andreas Müller |
386 | Christopher Williams | ||
386 | 387 | ||
387 | 388 | ||
388 | The libmad team | 389 | The libmad team |