Merge pull request #373 from fungl164/fungl164/chrome-live-osx-2

Fix crash when closing Chrome without a callback function in place

Author: redmunds

appshell/appshell_extensions_mac.mm

@@ -151,19 +151,23 @@ void SetLiveBrowserPid(int pid)
 
 void LiveBrowserMgrMac::CloseLiveBrowserFireCallback(int valToSend)
 {
-    CefRefPtr<CefListValue> responseArgs = m_closeLiveBrowserCallback->GetArgumentList();
-    
     // kill the timers
     CloseLiveBrowserKillTimers();
 
     // Stop listening for ws shutdown notifications
     RemoveWorkspaceNotifications();
 
-    // Set common response args (callbackId and error)
-    responseArgs->SetInt(1, valToSend);
-    
-    // Send response
-    m_browser->SendProcessMessage(PID_RENDERER, m_closeLiveBrowserCallback);
+    // Prepare response
+    if (m_closeLiveBrowserCallback) {
+
+        CefRefPtr<CefListValue> responseArgs = m_closeLiveBrowserCallback->GetArgumentList();
+
+        // Set common response args (callbackId and error)
+        responseArgs->SetInt(1, valToSend);
+
+        // Send response
+        m_browser->SendProcessMessage(PID_RENDERER, m_closeLiveBrowserCallback);
+    }
 
     // Clear state
     m_closeLiveBrowserCallback = NULL;