- remove the NULL check and determine the main windows if a modal dialog is opened and derive the CefBrowser instance from that window

Author: ingorichter

appshell/cefclient_mac.mm

@@ -691,6 +691,17 @@ - (BOOL)application:(NSApplication *)theApplication openFiles:(NSArray *)filenam
     ClientApplication * clientApp = (ClientApplication *)theApplication;
     NSWindow* targetWindow = [clientApp findTargetWindow];
     if (targetWindow) {
+      // if files are droppend and the Open/Save Dialog is visible, then browser is NULL
+      // find the main window. If this is not the main window, then it's a modal dialog like open or save. The main
+      // window has a reference to the CerBrowser instance
+      // This fixes https://github.com/adobe/brackets/issues/7752
+      if (![targetWindow isMainWindow]) {
+          targetWindow = [targetWindow parentWindow];
+      }
+
+      // move App window to front
+      [targetWindow orderFront: self];
+        
       CefRefPtr<CefBrowser> browser = ClientHandler::GetBrowserForNativeWindow(targetWindow);
       NSUInteger count = [filenames count];
       if (count) {

appshell/client_handler.cpp

@@ -354,12 +354,8 @@ void ClientHandler::SendOpenFileCommand(CefRefPtr<CefBrowser> browser, const Cef
   // FIXME: Use SendJSCommand once it supports parameters
   std::string cmd = "require('command/CommandManager').execute('file.openDroppedFiles'," + fileArrayStr + ")";
 
-  // if files are droppend and the Open Dialog is visible, then browser is NULL
-  // This fixes https://github.com/adobe/brackets/issues/7752
-  if (browser) {
-    browser->GetMainFrame()->ExecuteJavaScript(CefString(cmd.c_str()),
+  browser->GetMainFrame()->ExecuteJavaScript(CefString(cmd.c_str()),
                                 browser->GetMainFrame()->GetURL(), 0);
-  }
 }
 
 void ClientHandler::DispatchCloseToNextBrowser()