From d9fd6cc9d30018d929a1b5a02554a72e9ca478cc Mon Sep 17 00:00:00 2001 From: emaste Date: Thu, 24 Sep 2015 19:37:34 +0000 Subject: [PATCH] MFC r283929: Correct grdc(1) 12-hour display between 12:00 and 13:00 PM starts at 12:00, not 13:00. PR: 194291, 200133 Submitted by: Nick Price git-svn-id: svn://svn.freebsd.org/base/stable/10@288185 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- games/grdc/grdc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/games/grdc/grdc.c b/games/grdc/grdc.c index 4632c79ca..04cc00b37 100644 --- a/games/grdc/grdc.c +++ b/games/grdc/grdc.c @@ -150,14 +150,14 @@ main(int argc, char *argv[]) set(tm->tm_min/10, 14); if (t12) { - if (tm->tm_hour > 12) { - tm->tm_hour -= 12; - mvaddstr(YBASE + 5, XBASE + 52, "PM"); - } else { + if (tm->tm_hour < 12) { if (tm->tm_hour == 0) tm->tm_hour = 12; - mvaddstr(YBASE + 5, XBASE + 52, "AM"); + } else { + if (tm->tm_hour > 12) + tm->tm_hour -= 12; + mvaddstr(YBASE + 5, XBASE + 52, "PM"); } } -- 2.42.0