[F] Use lastActivate as the base for nextActivate rather than current date

2021-01-17 14:58:28 -05:00
parent d0ab0ba81d
commit ce758633b0
1 changed files with 4 additions and 6 deletions
@@ -51,15 +51,13 @@ struct Alarm: Codable
    var oneTime = true
    
    /// When is the last time that the alarm went off
-    var lastActivate: Date? = nil
+    var lastActivate: Date = Date()
    
-    /// When should the alarm activate next
+    /// When should the alarm activate next since lastActivate?
    var nextActivate: Date?
    {
-        // Get current date
-        let now = Date()
-        let (y, m, d) = now.getYMD()
-        let (nh, nm, _) = now.getHMS()
+        let (y, m, d) = lastActivate.getYMD()
+        let (nh, nm, _) = lastActivate.getHMS()
        
        // Create activation date
        var date = Date.create(y, m, d, hour, minute)