From 3a3089c629879efda28fa724c97df937b8e50d04 Mon Sep 17 00:00:00 2001 From: narspt Date: Thu, 3 Jun 2021 18:02:35 +0100 Subject: [PATCH] Fix bug in code to say French time it was unable to say 23:45 correctly --- TimeServer/TimeServerThread.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/TimeServer/TimeServerThread.cpp b/TimeServer/TimeServerThread.cpp index dd28cdc..4f45698 100644 --- a/TimeServer/TimeServerThread.cpp +++ b/TimeServer/TimeServerThread.cpp @@ -618,8 +618,12 @@ wxArrayString CTimeServerThread::sendTimeFrFR(unsigned int hour, unsigned int mi words.Add(wxT("il_est")); - if (min == 45U) - hour++; + if (min == 45U) { + if (hour == 23U) + hour = 0U; + else + hour++; + } if (hour == 0U) { words.Add(wxT("minuit")); @@ -660,10 +664,6 @@ wxArrayString CTimeServerThread::sendTimeFrFR(unsigned int hour, unsigned int mi words.Add(wxT("et_demie")); } else if (min == 45U) { words.Add(wxT("moins_le_quart")); - if (hour == 23U) - hour = 0U; - else - hour++; } return words;