Skip to content

Commit ccb6a2c

Browse files
committed
Merge remote-tracking branch 'remotes/upstream/master' into cef/2062-jsb-wip
2 parents a76ada3 + 8932fd3 commit ccb6a2c

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

CefSharp.Core/ManagedCefBrowserAdapter.h

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2010-2014 The CefSharp Authors. All rights reserved.
1+
// Copyright © 2010-2014 The CefSharp Authors. All rights reserved.
22
//
33
// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
44

@@ -87,21 +87,24 @@ namespace CefSharp
8787
cefFrame->LoadURL(StringUtils::ToNative(address));
8888
}
8989
}
90-
90+
9191
void OnAfterBrowserCreated(int browserId)
9292
{
9393
_browserProcessServiceHost = gcnew BrowserProcessServiceHost(_javaScriptObjectRepository, Process::GetCurrentProcess()->Id, browserId);
9494
_browserProcessServiceHost->Open();
9595

96-
_webBrowserInternal->OnInitialized();
96+
if(_webBrowserInternal != nullptr)
97+
{
98+
_webBrowserInternal->OnInitialized();
9799

98-
auto address = _address;
100+
auto address = _address;
99101

100-
if (address != nullptr)
101-
{
102-
LoadUrl(address);
102+
if (address != nullptr)
103+
{
104+
LoadUrl(address);
105+
}
103106
}
104-
};
107+
}
105108

106109
void LoadHtml(String^ html, String^ url)
107110
{

0 commit comments

Comments
 (0)