[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.3/kdepim/kalarm
From:       David Jarvie <djarvie () kde ! org>
Date:       2009-11-01 15:19:48
Message-ID: 1257088788.345928.13701.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1043445 by djarvie:

Prevent infinite loop if NEXTRECUR time in alarm is before alarm start time


 M  +4 -1      Changelog  
 M  +2 -0      alarmevent.cpp  
 M  +1 -1      kalarm.h  


--- branches/KDE/4.3/kdepim/kalarm/Changelog #1043444:1043445
@@ -1,5 +1,9 @@
 KAlarm Change Log
 
+=== Version 2.2.10 --- 1 November 2009 ===
+- If dual screens, show alarm in other screen if active window is full screen.
+- Prevent infinite loop if NEXTRECUR time in alarm is before alarm start time.
+
 === Version 2.2.9 (KDE 4.3.3) --- 29 October 2009 ===
 - Fix recurring date-only alarm triggering repeatedly and eating up CPU, if the
   start-of-day time is after midnight and the alarm is due, but current UTC time
@@ -11,7 +15,6 @@
 - Interpret '~' properly in entered file names.
 - Prevent sound file configuration dialogue closing after showing error message.
 - Fix crash if calendar formats are updated at login, during session restoration.
-- If dual screens, show alarm in other screen if active window is full screen.
 
 === Version 2.2.8 (KDE 4.3.2) --- 28 September 2009 ===
 - Use KDE system settings to determine default working days in the week.
--- branches/KDE/4.3/kdepim/kalarm/alarmevent.cpp #1043444:1043445
@@ -687,6 +687,8 @@
 					next.setTime(t);
 				}
 			}
+			if (next < start)
+				next = start;   // ensure next recurrence time is valid
 		}
 	}
 	return next;
--- branches/KDE/4.3/kdepim/kalarm/kalarm.h #1043444:1043445
@@ -23,7 +23,7 @@
 
 #undef QT3_SUPPORT
 
-#define KALARM_VERSION "2.2.9"
+#define KALARM_VERSION "2.2.10"
 #define KALARM_NAME "KAlarm"
 #define KALARM_DBUS_SERVICE  "org.kde.kalarm"  // D-Bus service name of KAlarm application
 
[prev in list] [next in list] [prev in thread] [next in thread]