aboutsummaryrefslogtreecommitdiffstats
path: root/WireGuard/WireGuard/UI/macOS/AppDelegate.swift
diff options
context:
space:
mode:
authorRoopesh Chander <roop@roopc.net>2019-02-21 19:41:01 +0530
committerRoopesh Chander <roop@roopc.net>2019-02-22 13:03:53 +0530
commit7a580e8941b95eff80dfe9d2f1deb05b3c2cab85 (patch)
tree88b7f5a62be3b07af622f7d0e4fe51e2300eaf75 /WireGuard/WireGuard/UI/macOS/AppDelegate.swift
parentmacOS: Fix removal of DNSes from AllowedIPs when DNS has changed (diff)
downloadwireguard-apple-7a580e8941b95eff80dfe9d2f1deb05b3c2cab85.tar.xz
wireguard-apple-7a580e8941b95eff80dfe9d2f1deb05b3c2cab85.zip
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>
Diffstat (limited to 'WireGuard/WireGuard/UI/macOS/AppDelegate.swift')
-rw-r--r--WireGuard/WireGuard/UI/macOS/AppDelegate.swift15
1 files changed, 5 insertions, 10 deletions
diff --git a/WireGuard/WireGuard/UI/macOS/AppDelegate.swift b/WireGuard/WireGuard/UI/macOS/AppDelegate.swift
index fde1a276..cbe6153c 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)
}
}
}