Check for key window first

lukakerr · Mar 10, 2019 · 2471fdd · 2471fdd
1 parent c099e62
commit 2471fdd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/Pine/AppDelegate.swift b/Pine/AppDelegate.swift
@@ -94,6 +94,8 @@ class AppDelegate: NSObject, NSApplicationDelegate {
               completionHandler: { _,_,_  in }
             )
           }
+
+          Utils.getCurrentMainWindowController()?.window?.makeKeyAndOrderFront(nil)
         }
       }
     }

diff --git a/Pine/Helpers/Utils.swift b/Pine/Helpers/Utils.swift
@@ -13,6 +13,10 @@ class Utils {
 
   /// The current main window controller of the application
   public static func getCurrentMainWindowController() -> PineWindowController? {
+    if let keyWindow = NSApp.keyWindow, keyWindow.isVisible {
+      return keyWindow.windowController as? PineWindowController
+    }
+
     return NSApp.windows.filter({ $0.isVisible }).first?.windowController as? PineWindowController
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -94,6 +94,8 @@ class AppDelegate: NSObject, NSApplicationDelegate { @@
                   completionHandler: { _,_,_  in }
                 )
               }
+              Utils.getCurrentMainWindowController()?.window?.makeKeyAndOrderFront(nil)
             }
           }
         }
@@ Expand Down @@