Merge revision 1543 changes:
- Fix crash when browser window creation is canceled (issue #1147). git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1547@1545 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
parent
e6cddfd6f5
commit
f17fd1ca81
|
@ -311,7 +311,7 @@ CefRefPtr<CefBrowser> CefBrowserHost::CreateBrowserSync(
|
||||||
CefRefPtr<CefBrowserHostImpl> browser =
|
CefRefPtr<CefBrowserHostImpl> browser =
|
||||||
CefBrowserHostImpl::Create(windowInfo, new_settings, client, NULL, info,
|
CefBrowserHostImpl::Create(windowInfo, new_settings, client, NULL, info,
|
||||||
NULL);
|
NULL);
|
||||||
if (!url.empty()) {
|
if (browser && !url.empty()) {
|
||||||
browser->LoadURL(CefFrameHostImpl::kMainFrameId, url, content::Referrer(),
|
browser->LoadURL(CefFrameHostImpl::kMainFrameId, url, content::Referrer(),
|
||||||
content::PAGE_TRANSITION_TYPED, std::string());
|
content::PAGE_TRANSITION_TYPED, std::string());
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue