Merge pull request #249 from adobe/glenn/crash-on-refresh

Fix potential crash when reloading Brackets
adobe · May 23, 2013 · d648b21 · d648b21
2 parents 4d4b0b3 + 29262a7
commit d648b21
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/appshell/client_app.cpp b/appshell/client_app.cpp
@@ -161,7 +161,10 @@ class AppShellExtensionHandler : public CefV8Handler {
           // Pass all messages to the browser process. Look in appshell_extensions.cpp for implementation.
           CefRefPtr<CefBrowser> browser = 
                 CefV8Context::GetCurrentContext()->GetBrowser();
-          ASSERT(browser.get());
+          if (!browser.get()) {
+              // If we don't have a browser, we can't handle the command.
+              return false;
+          }
           CefRefPtr<CefProcessMessage> message = 
                 CefProcessMessage::Create(name);
           CefRefPtr<CefListValue> messageArgs = message->GetArgumentList();