From: Roopesh Chander Date: Thu, 9 May 2019 19:00:02 +0000 (+0530) Subject: macOS: Quit in main menu shall just close the window X-Git-Tag: 0.0.20190531-9~29 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5190fc2249fac8b762c899ea6e2d8974090fb94e;p=thirdparty%2Fwireguard-apple.git macOS: Quit in main menu shall just close the window Signed-off-by: Roopesh Chander --- diff --git a/WireGuard/WireGuard/Base.lproj/Localizable.strings b/WireGuard/WireGuard/Base.lproj/Localizable.strings index 1d05a45..16f0737 100644 --- a/WireGuard/WireGuard/Base.lproj/Localizable.strings +++ b/WireGuard/WireGuard/Base.lproj/Localizable.strings @@ -308,6 +308,7 @@ "macMenuHideApp" = "Hide WireGuard"; "macMenuHideOtherApps" = "Hide Others"; "macMenuShowAllApps" = "Show All"; +"macMenuQuitManagingTunnels" = "Quit Tunnel Manager"; "macMenuFile" = "File"; "macMenuCloseWindow" = "Close Window"; diff --git a/WireGuard/WireGuard/UI/macOS/MainMenu.swift b/WireGuard/WireGuard/UI/macOS/MainMenu.swift index 9a5a8ef..3c2e89f 100644 --- a/WireGuard/WireGuard/UI/macOS/MainMenu.swift +++ b/WireGuard/WireGuard/UI/macOS/MainMenu.swift @@ -51,9 +51,8 @@ class MainMenu: NSMenu { menu.addItem(NSMenuItem.separator()) - let quitMenuItem = menu.addItem(withTitle: tr("macMenuQuit"), - action: #selector(AppDelegate.quit), keyEquivalent: "q") - quitMenuItem.target = NSApp.delegate + menu.addItem(withTitle: tr("macMenuQuitManagingTunnels"), + action: #selector(NSWindow.performClose(_:)), keyEquivalent: "q") return menu }