Issue 1594 - Updated calls to GetBrowserWrapper()

edgchen1 · amaitland · commit 1773b8b03f10 · 2016-04-21T07:37:33.000+10:00
Changed the returnNullIfBrowserNotFound parameter to true for some calls to GetBrowserWrapper() to prevent exceptions when closing a popup window.
diff --git a/CefSharp.Core/Internals/ClientAdapter.cpp b/CefSharp.Core/Internals/ClientAdapter.cpp
@@ -612,7 +612,7 @@ namespace CefSharp
                 return false;
             }
                 
-            auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup(), false);
+            auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup(), true);
             CefFrameWrapper frameWrapper(frame);
             CefRequestWrapper requestWrapper(request);
             CefResponseWrapper responseWrapper(response);
@@ -660,7 +660,7 @@ namespace CefSharp
                 return NULL;
             }
 
-            auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup(), false);
+            auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup(), true);
             auto frameWrapper = gcnew CefFrameWrapper(frame);
             auto requestWrapper = gcnew CefRequestWrapper(request);
 

Original file line number	Diff line number	Diff line change
`@@ -612,7 +612,7 @@ namespace CefSharp`
`612`	`612`	`return false;`
`613`	`613`	`}`
`614`	`614`
`615`		`- auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup(), false);`
	`615`	`+ auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup(), true);`
`616`	`616`	`CefFrameWrapper frameWrapper(frame);`
`617`	`617`	`CefRequestWrapper requestWrapper(request);`
`618`	`618`	`CefResponseWrapper responseWrapper(response);`
`@@ -660,7 +660,7 @@ namespace CefSharp`
`660`	`660`	`return NULL;`
`661`	`661`	`}`
`662`	`662`
`663`		`- auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup(), false);`
	`663`	`+ auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup(), true);`
`664`	`664`	`auto frameWrapper = gcnew CefFrameWrapper(frame);`
`665`	`665`	`auto requestWrapper = gcnew CefRequestWrapper(request);`
`666`	`666`