DeferView triggers userInitiatedExit() instead of the dismissal sheet

This code didn't work last week, but it was due to my use of AppKit.NSApp.terminate(nil). When I moved to exit(0), this allowed this code to actually work. I just didn't know about it.
macadmins · Aug 23, 2021 · 50f542f · 50f542f
1 parent f56afe6
commit 50f542f
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git a/Nudge/UI/DeferView.swift b/Nudge/UI/DeferView.swift
@@ -59,7 +59,7 @@ struct DeferView: View {
                     viewObserved.userDeferrals = viewObserved.userSessionDeferrals + viewObserved.userQuitDeferrals
                     Utils().logUserQuitDeferrals()
                     Utils().logUserDeferrals()
-                    self.presentationMode.wrappedValue.dismiss()
+                    Utils().userInitiatedExit()
                 } label: {
                     Text("Defer")
                         .frame(minWidth: 35)

diff --git a/Nudge/UI/SimpleMode/SimpleMode.swift b/Nudge/UI/SimpleMode/SimpleMode.swift
@@ -231,9 +231,6 @@ struct SimpleMode: View {
                         }
                         .frame(maxHeight: 30)
                         .sheet(isPresented: $showDeferView) {
-                            if viewObserved.shouldExit {
-                                Utils().userInitiatedExit()
-                            }
                         } content: {
                             DeferView(viewObserved: viewObserved)
                         }

diff --git a/Nudge/UI/StandardMode/RightSide.swift b/Nudge/UI/StandardMode/RightSide.swift
@@ -269,9 +269,6 @@ struct StandardModeRightSide: View {
                             }
                         }
                         .sheet(isPresented: $showDeferView) {
-                            if viewObserved.shouldExit {
-                                Utils().userInitiatedExit()
-                            }
                         } content: {
                             DeferView(viewObserved: viewObserved)
                         }