From 7a580e8941b95eff80dfe9d2f1deb05b3c2cab85 Mon Sep 17 00:00:00 2001
From: Roopesh Chander <roop@roopc.net>
Date: Thu, 21 Feb 2019 19:41:01 +0530
Subject: macOS: Show 'quitting with active tunnel' only when appropriate

Not when logging off or when the machine's shutting down

Signed-off-by: Roopesh Chander <roop@roopc.net>
---
 WireGuard/WireGuard/UI/macOS/AppDelegate.swift | 15 +++++----------
 WireGuard/WireGuard/UI/macOS/Application.swift |  2 +-
 WireGuard/WireGuard/UI/macOS/StatusMenu.swift  |  4 ++--
 3 files changed, 8 insertions(+), 13 deletions(-)

(limited to 'WireGuard')

diff --git a/WireGuard/WireGuard/UI/macOS/AppDelegate.swift b/WireGuard/WireGuard/UI/macOS/AppDelegate.swift
index fde1a27..cbe6153 100644
--- a/WireGuard/WireGuard/UI/macOS/AppDelegate.swift
+++ b/WireGuard/WireGuard/UI/macOS/AppDelegate.swift
@@ -12,7 +12,6 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
     var manageTunnelsRootVC: ManageTunnelsRootViewController?
     var manageTunnelsWindowObject: NSWindow?
-    var isTerminationAlertShown = false
 
     func applicationDidFinishLaunching(_ aNotification: Notification) {
         Logger.configureGlobal(withFilePath: FileManager.appLogFileURL?.path)
@@ -42,25 +41,21 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         }
     }
 
-    func applicationShouldTerminate(_ sender: NSApplication) -> NSApplication.TerminateReply {
+    @objc func quit() {
         guard let currentTunnel = tunnelsTracker?.currentTunnel, currentTunnel.status == .active || currentTunnel.status == .activating else {
-            return .terminateNow
-        }
-        if isTerminationAlertShown {
-            return .terminateNow
+            NSApp.terminate(nil)
+            return
         }
         let alert = NSAlert()
         alert.messageText = tr("macAppExitingWithActiveTunnelMessage")
         alert.informativeText = tr("macAppExitingWithActiveTunnelInfo")
         if let window = manageTunnelsWindowObject {
-            alert.beginSheetModal(for: window) { [weak self] _ in
-                self?.isTerminationAlertShown = true
+            alert.beginSheetModal(for: window) { _ in
                 NSApp.terminate(nil)
             }
-            return .terminateCancel
         } else {
             alert.runModal()
-            return .terminateNow
+            NSApp.terminate(nil)
         }
     }
 }
diff --git a/WireGuard/WireGuard/UI/macOS/Application.swift b/WireGuard/WireGuard/UI/macOS/Application.swift
index f1da81a..6e33802 100644
--- a/WireGuard/WireGuard/UI/macOS/Application.swift
+++ b/WireGuard/WireGuard/UI/macOS/Application.swift
@@ -14,7 +14,7 @@ class Application: NSApplication {
         "Z": #selector(UndoActionRespondable.redo(_:)),
         "w": #selector(NSWindow.performClose(_:)),
         "m": #selector(NSWindow.performMiniaturize(_:)),
-        "q": #selector(NSApplication.terminate(_:))
+        "q": #selector(AppDelegate.quit)
     ]
 
     private var appDelegate: AppDelegate? //swiftlint:disable:this weak_delegate
diff --git a/WireGuard/WireGuard/UI/macOS/StatusMenu.swift b/WireGuard/WireGuard/UI/macOS/StatusMenu.swift
index 70d536b..ada33dc 100644
--- a/WireGuard/WireGuard/UI/macOS/StatusMenu.swift
+++ b/WireGuard/WireGuard/UI/macOS/StatusMenu.swift
@@ -122,8 +122,8 @@ class StatusMenu: NSMenu {
         let aboutItem = NSMenuItem(title: tr("macMenuAbout"), action: #selector(aboutClicked), keyEquivalent: "")
         aboutItem.target = self
         addItem(aboutItem)
-        let quitItem = NSMenuItem(title: tr("macMenuQuit"), action: #selector(NSApplication.terminate), keyEquivalent: "")
-        quitItem.target = NSApp
+        let quitItem = NSMenuItem(title: tr("macMenuQuit"), action: #selector(AppDelegate.quit), keyEquivalent: "")
+        quitItem.target = NSApp.delegate
         addItem(quitItem)
     }
 
-- 
cgit v1.2.3-59-g8ed1b