Improve BackgroundTimer code

zotero · Jan 29, 2025 · 287b66f · 287b66f
1 parent 4a9d3b2
commit 287b66f
Showing 1 changed file with 9 additions and 13 deletions.
diff --git a/Zotero/Controllers/BackgroundTimer.swift b/Zotero/Controllers/BackgroundTimer.swift
@@ -30,7 +30,15 @@ final class BackgroundTimer {
     }
 
     deinit {
-        invalidate()
+        guard let timer else { return }
+        timer.setEventHandler {}
+        timer.cancel()
+        /*
+         If the timer is suspended, calling cancel without resuming
+         triggers a crash. This is documented here https://forums.developer.apple.com/thread/15902
+         */
+        resume()
+        eventHandler = nil
     }
 
     func resume() {
@@ -47,18 +55,6 @@ final class BackgroundTimer {
         timer.suspend()
     }
 
-    func invalidate() {
-        guard let timer else { return }
-        timer.setEventHandler {}
-        timer.cancel()
-        /*
-         If the timer is suspended, calling cancel without resuming
-         triggers a crash. This is documented here https://forums.developer.apple.com/thread/15902
-         */
-        resume()
-        eventHandler = nil
-    }
-
     private func createTimer() -> DispatchSourceTimer {
         let timer = DispatchSource.makeTimerSource(flags: [], queue: queue)
         let now = DispatchTime.now()