+++ app/alarm/AlarmDelegate.qml	2015-06-14 13:23:58 +0000
@@ -100,14 +100,17 @@
                  gone-off and the user is re-enabling the alarm. Repeating
                  alarms do this automatically.
                 */
-                if(checked && type === Alarm.OneTime && alarmData.date < new Date()) {
+                if(checked && type === Alarm.OneTime) {
                     var currentTime = new Date()
-                    alarmData.daysOfWeek = alarmUtils.get_alarm_day(currentTime.getDay())
-
-                    if (alarmData.date.getTime() <= currentTime.getTime()) {
-                        var tomorrow = currentTime
-                        tomorrow.setDate(tomorrow.getDate() + 1)
-                        alarmData.daysOfWeek = alarmUtils.get_alarm_day(tomorrow.getDay())
+                    alarmData.daysOfWeek = Alarm.AutoDetect
+                    if (alarmData.date.getHours()*60+alarmData.date.getMinutes() <= currentTime.getHours()*60+currentTime.getMinutes()) {
+                        var d=new Date()
+                        var tdate2 = new Date(d.getFullYear(),d.getMonth(),d.getDate()+1,alarmData.date.getHours(),alarmData.date.getMinutes(),0,0)
+                        alarmData.date = tdate2
+                    } else {
+                        var d=new Date()
+                        var tdate2 = new Date(d.getFullYear(),d.getMonth(),d.getDate(),alarmData.date.getHours(),alarmData.date.getMinutes(),0,0)
+                        alarmData.date = tdate2
                     }
                 }