From ce758633b0428d565cf3e8fe2e413b0bfff9dcf4 Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Sun, 17 Jan 2021 14:58:28 -0500 Subject: [PATCH] [F] Use lastActivate as the base for nextActivate rather than current date --- ProjectClock/Models.swift | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/ProjectClock/Models.swift b/ProjectClock/Models.swift index 78bd422..3a7a232 100644 --- a/ProjectClock/Models.swift +++ b/ProjectClock/Models.swift @@ -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)