From dd9506eceeae1144078aa33cd55bf5bff8aa7dc7 Mon Sep 17 00:00:00 2001
From: Roopesh Chander <roop@roopc.net>
Date: Fri, 29 Mar 2019 00:02:54 +0530
Subject: [PATCH] macOS: If a sheet is being shown, ignore quit and bring
 window to front

Otherwise, the 'exiting with an active tunnel' alert could get queued up
to be shown after the current sheet is dismissed.

Signed-off-by: Roopesh Chander <roop@roopc.net>
---
 WireGuard/WireGuard/UI/macOS/AppDelegate.swift | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/WireGuard/WireGuard/UI/macOS/AppDelegate.swift b/WireGuard/WireGuard/UI/macOS/AppDelegate.swift
index 1d6d294..990a379 100644
--- a/WireGuard/WireGuard/UI/macOS/AppDelegate.swift
+++ b/WireGuard/WireGuard/UI/macOS/AppDelegate.swift
@@ -44,6 +44,11 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     }
 
     @objc func quit() {
+        if let manageWindow = manageTunnelsWindowObject, manageWindow.attachedSheet != nil {
+            NSApp.activate(ignoringOtherApps: true)
+            manageWindow.orderFront(self)
+            return
+        }
         registerLoginItem(shouldLaunchAtLogin: false)
         guard let currentTunnel = tunnelsTracker?.currentTunnel, currentTunnel.status == .active || currentTunnel.status == .activating else {
             NSApp.terminate(nil)