Fix issue causing "start timer" to do nothing if settings dialog has …

…never been shown
kristopherjohnson · Nov 10, 2019 · c68e08f · c68e08f
1 parent 9823d61
commit c68e08f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 20 deletions.
diff --git a/MenubarCountdown/AppDelegate.swift b/MenubarCountdown/AppDelegate.swift
@@ -420,19 +420,19 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele
     func dismissStartTimerDialogAndStartTimer(_ sender: AnyObject) {
         if let startTimerDialogController = startTimerDialogController {
             startTimerDialogController.dismissDialog(sender)
+        }
 
-            timerSettingSeconds = Int(startTimerDialogController.timerInterval)
-            secondsRemaining = timerSettingSeconds
+        timerSettingSeconds = (startHours * 3600) + (startMinutes * 60) + startSeconds
+        secondsRemaining = timerSettingSeconds
 
-            isTimerRunning = true
-            canPause = true
-            canResume = false
-            stopwatch.reset()
+        isTimerRunning = true
+        canPause = true
+        canResume = false
+        stopwatch.reset()
 
-            updateStatusItemTitle(timeRemaining: timerSettingSeconds)
+        updateStatusItemTitle(timeRemaining: timerSettingSeconds)
 
-            waitForNextSecond()
-        }
+        waitForNextSecond()
     }
 
     /**

diff --git a/MenubarCountdown/StartTimerDialogController.swift b/MenubarCountdown/StartTimerDialogController.swift
@@ -26,17 +26,6 @@ class StartTimerDialogController: NSWindowController {
             topLevelObjects: nil)
     }
 
-    /**
-     The total number of seconds represented by the hours:minutes:seconds settings.
-     */
-    var timerInterval: TimeInterval {
-        let defaults = UserDefaults.standard
-        let hours = defaults.integer(forKey: AppUserDefaults.timerHoursKey);
-        let minutes = defaults.integer(forKey: AppUserDefaults.timerMinutesKey);
-        let seconds = defaults.integer(forKey: AppUserDefaults.timerSecondsKey);
-        return TimeInterval((hours * 3600) + (minutes * 60) + seconds);
-    }
-
     /**
      Display the dialog and bring it to the front.
      */