Merge pull request #450 from adobe/ingo/fix-7752

Fix Crash when open file via OS while File > Open dialog is left open (adobe/brackets#7752)
adobe · Aug 20, 2014 · 2dd2071 · 2dd2071
2 parents 9e1bae2 + 26795a1
commit 2dd2071
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/appshell/client_handler.cpp b/appshell/client_handler.cpp
@@ -353,8 +353,13 @@ void ClientHandler::SendOpenFileCommand(CefRefPtr<CefBrowser> browser, const Cef
   std::string fileArrayStr(fileArray);
   // FIXME: Use SendJSCommand once it supports parameters
   std::string cmd = "require('command/CommandManager').execute('file.openDroppedFiles'," + fileArrayStr + ")";
-  browser->GetMainFrame()->ExecuteJavaScript(CefString(cmd.c_str()),
+
+  // 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()->GetURL(), 0);
+  }
 }
 
 void ClientHandler::DispatchCloseToNextBrowser()