summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNils Wallménius <nils@rockbox.org>2008-05-15 20:16:38 +0000
committerNils Wallménius <nils@rockbox.org>2008-05-15 20:16:38 +0000
commit4840682e258b85acbbe4254de950f72cb7757041 (patch)
treebc67dd031a2b6bfa029cbfb86aa462b6242bfa76
parent1ea884b53126206ffbc1607454d5d7d255acec7e (diff)
downloadrockbox-4840682e258b85acbbe4254de950f72cb7757041.tar.gz
rockbox-4840682e258b85acbbe4254de950f72cb7757041.zip
FS#8995 by Mark Ganson fixing the display of am/pm for the digital clock mode
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17526 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/plugins/clock/clock_draw_digital.c2
-rw-r--r--docs/CREDITS1
2 files changed, 2 insertions, 1 deletions
diff --git a/apps/plugins/clock/clock_draw_digital.c b/apps/plugins/clock/clock_draw_digital.c
index 790beb4c29..062f291df8 100644
--- a/apps/plugins/clock/clock_draw_digital.c
+++ b/apps/plugins/clock/clock_draw_digital.c
@@ -55,7 +55,7 @@ void digital_clock_draw(struct screen* display,
buffer_printf(buffer, buffer_pos, "%c", display_colon?':':' ');
buffer_printf(buffer, buffer_pos, "%02d", time->minute);
if(settings->general.hour_format==H12){
- if(time->hour>12){
+ if(time->hour>=12){
buffer_printf(buffer, buffer_pos, "P");/* PM */
}else{
buffer_printf(buffer, buffer_pos, "A");/* AM */
diff --git a/docs/CREDITS b/docs/CREDITS
index 8ec78d77b7..dc43e283c9 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -389,6 +389,7 @@ Tomasz Wasilczyk
Kenjiro Arai
John Kaminar
Joris Goosen
+Mark Ganson
The libmad team