fix exit logic

macadmins · Aug 18, 2021 · 50c71ca · 50c71ca
1 parent 8d8c06d
commit 50c71ca
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Nudge/UI/DeferView.swift b/Nudge/UI/DeferView.swift
@@ -55,7 +55,7 @@ struct DeferView: View {
                     Utils().logUserQuitDeferrals()
                     nudgeDefaults.set(nudgeCustomEventDate, forKey: "deferRunUntil")
                     userHasClickedDeferralQuitButton(deferralTime: nudgeCustomEventDate)
-                    viewObserved.shouldExit.toggle()
+                    viewObserved.shouldExit = true
                     self.presentationMode.wrappedValue.dismiss()
                 } label: {
                     Text("Defer")

diff --git a/Nudge/UI/Main.swift b/Nudge/UI/Main.swift
@@ -86,7 +86,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         if Utils().requireMajorUpgrade() && fetchMajorUpgradeSuccessful == false && majorUpgradeAppPathExists == false {
             let msg = "Unable to fetch major upgrade and application missing, exiting Nudge"
             uiLog.notice("\(msg, privacy: .public)")
-            nudgePrimaryState.shouldExit.toggle()
+            nudgePrimaryState.shouldExit = true
             AppKit.NSApp.terminate(nil)
         }
     }

diff --git a/Nudge/Utilities/Utils.swift b/Nudge/Utilities/Utils.swift
@@ -96,7 +96,7 @@ struct Utils {
     func exitNudge() {
         let msg = "Nudge is terminating due to condition met"
         uiLog.notice("\(msg, privacy: .public)")
-        nudgePrimaryState.shouldExit.toggle()
+        nudgePrimaryState.shouldExit = true
         AppKit.NSApp.terminate(nil)
     }
 
@@ -427,7 +427,7 @@ struct Utils {
     func userInitiatedExit() {
         let msg = "User clicked primaryQuitButton"
         uiLog.notice("\(msg, privacy: .public)")
-        nudgePrimaryState.shouldExit.toggle()
+        nudgePrimaryState.shouldExit = true
         AppKit.NSApp.terminate(nil)
     }