Pass BrowserId to OnAfterBrowserCreated action as a param - in rare case user was getting nullptr exception

Author: amaitland

CefSharp.Core/Internals/ClientAdapter.cpp

@@ -41,10 +41,11 @@ namespace CefSharp
             {
                 _browserHwnd = browser->GetHost()->GetWindowHandle();
                 _cefBrowser = browser;
+                auto browserId = browser->GetIdentifier();
 
-                if (static_cast<Action^>(_onAfterBrowserCreated) != nullptr)
+                if (static_cast<Action<int>^>(_onAfterBrowserCreated) != nullptr)
                 {
-                    _onAfterBrowserCreated->Invoke();
+                    _onAfterBrowserCreated->Invoke(browserId);
                 }
             }
         }

CefSharp.Core/Internals/ClientAdapter.h

@@ -30,14 +30,14 @@ namespace CefSharp
         {
         private:
             gcroot<IWebBrowserInternal^> _browserControl;            
-            gcroot<Action^> _onAfterBrowserCreated;
+            gcroot<Action<int>^> _onAfterBrowserCreated;
             HWND _browserHwnd;
             CefRefPtr<CefBrowser> _cefBrowser;
 
             gcroot<String^> _tooltip;
 
         public:
-            ClientAdapter(IWebBrowserInternal^ browserControl, Action^ onAfterBrowserCreated) :
+            ClientAdapter(IWebBrowserInternal^ browserControl, Action<int>^ onAfterBrowserCreated) :
                 _browserControl(browserControl), 
                 _onAfterBrowserCreated(onAfterBrowserCreated)
             {

CefSharp.Core/Internals/RenderClientAdapter.h

@@ -25,8 +25,8 @@ namespace CefSharp
             gcroot<BitmapInfo^> MainBitmapInfo;
             gcroot<BitmapInfo^> PopupBitmapInfo;
 
-            RenderClientAdapter(IWebBrowserInternal^ webBrowserInternal, Action^ onBrowserCreated):
-                ClientAdapter(webBrowserInternal, onBrowserCreated),
+            RenderClientAdapter(IWebBrowserInternal^ webBrowserInternal, Action<int>^ onAfterBrowserCreated):
+                ClientAdapter(webBrowserInternal, onAfterBrowserCreated),
                 _webBrowserInternal(webBrowserInternal)
             {
                 MainBitmapInfo = gcnew BitmapInfo();

CefSharp.Core/ManagedCefBrowserAdapter.h

@@ -67,7 +67,7 @@ namespace CefSharp
 
         ManagedCefBrowserAdapter(IWebBrowserInternal^ webBrowserInternal)
         {
-            _renderClientAdapter = new RenderClientAdapter(webBrowserInternal, gcnew Action(this, &ManagedCefBrowserAdapter::OnAfterBrowserCreated));
+            _renderClientAdapter = new RenderClientAdapter(webBrowserInternal, gcnew Action<int>(this, &ManagedCefBrowserAdapter::OnAfterBrowserCreated));
             _webBrowserInternal = webBrowserInternal;
 
             Initialize();
@@ -108,12 +108,9 @@ namespace CefSharp
                 cefFrame->LoadURL(StringUtils::ToNative(address));
             }
         }
-
-
-        void OnAfterBrowserCreated()
+        
+        void OnAfterBrowserCreated(int browserId)
         {
-            auto browserId = _renderClientAdapter->GetCefBrowser()->GetIdentifier();           
-                        
             _browserProcessServiceHost = gcnew BrowserProcessServiceHost(_javaScriptObjectRepository, Process::GetCurrentProcess()->Id, browserId);
             _browserProcessServiceHost->Open();