aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--WireGuard/WireGuard/UI/macOS/AppDelegate.swift15
-rw-r--r--WireGuard/WireGuard/UI/macOS/Application.swift2
-rw-r--r--WireGuard/WireGuard/UI/macOS/StatusMenu.swift4
3 files changed, 8 insertions, 13 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)
}
}
}
diff --git a/WireGuard/WireGuard/UI/macOS/Application.swift b/WireGuard/WireGuard/UI/macOS/Application.swift
index f1da81a0..6e33802f 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 70d536bf..ada33dc0 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)
}