Fix CEF crash on resource restart

multitheftauto · Oct 29, 2018 · 3372f0f · 3372f0f
1 parent fe560c2
commit 3372f0f
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/Client/cefweb/CWebCore.cpp b/Client/cefweb/CWebCore.cpp
@@ -127,12 +127,24 @@ void CWebCore::DoPulse()
 
 CWebView* CWebCore::FindWebView(CefRefPtr<CefBrowser> browser)
 {
+    if (!browser)
+        return nullptr;
+
     for (auto pWebView : m_WebViews)
     {
+        if (!pWebView)
+            continue;
+
+        CefRefPtr<CefBrowser> pBrowser = pWebView->GetCefBrowser();
+
+        if (!pBrowser)
+            continue;
+
         // CefBrowser objects are not unique
-        if (pWebView->GetCefBrowser()->GetIdentifier() == browser->GetIdentifier())
+        if (pBrowser->GetIdentifier() == browser->GetIdentifier())
             return pWebView.get();
     }
+
     return nullptr;
 }