From d46a6ca10fb6cac4f45435973098ba1ab2eddf03 Mon Sep 17 00:00:00 2001 From: Chris Frey Date: Mon, 19 Mar 2012 17:52:47 -0400 Subject: [PATCH] desktop: fixed signed comparison bug, and fixed seconds/minutes bug --- desktop/src/CalendarEditDlg.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/desktop/src/CalendarEditDlg.cc b/desktop/src/CalendarEditDlg.cc index ab658ab0..0e78de8e 100644 --- a/desktop/src/CalendarEditDlg.cc +++ b/desktop/src/CalendarEditDlg.cc @@ -450,14 +450,16 @@ bool CalendarEditDlg::TransferDataToWindow() m_EndDateObj.Set(m_rec.EndTime.Time); int duration = m_rec.EndTime.Time - m_rec.StartTime.Time; - if( duration > 0 ) { + duration /= 60; // convert to minutes + if( m_rec.EndTime.Time >= m_rec.StartTime.Time ) { m_duration_hours = duration / 60; m_duration_minutes = duration % 60; } if( m_rec.NotificationTime.Time ) { int span = m_rec.StartTime.Time - m_rec.NotificationTime.Time; - if( span > 0 ) { + span /= 60; // convert to minutes + if( m_rec.StartTime.Time > m_rec.NotificationTime.Time ) { m_reminder_hours = span / 60; m_reminder_minutes = span % 60; } -- 2.11.4.GIT