diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-18 11:08:43 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-18 11:08:43 +0200 |
| commit | 099ffa623920355f3a70402ddfa49dd1a3ecb2f0 (patch) | |
| tree | 97fbbf9bdbf606301575da3b3f8336fc75e892f0 /src/core/user_resource_controller_host.cpp | |
| parent | d6c8a2cf8fa374e6d1c0a578391b57112c047fa4 (diff) | |
| parent | 9c0bd9207560e36e7bad3657e02305aabd7638b9 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I2452f25335174d0e0c15a9e069fe50e1d92db1b8
Diffstat (limited to 'src/core/user_resource_controller_host.cpp')
| -rw-r--r-- | src/core/user_resource_controller_host.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/user_resource_controller_host.cpp b/src/core/user_resource_controller_host.cpp index b2de41cc0..9d2ba8eb8 100644 --- a/src/core/user_resource_controller_host.cpp +++ b/src/core/user_resource_controller_host.cpp @@ -81,7 +81,8 @@ void UserResourceControllerHost::WebContentsObserverHelper::RenderViewCreated(co void UserResourceControllerHost::WebContentsObserverHelper::RenderViewHostChanged(content::RenderViewHost *oldHost, content::RenderViewHost *newHost) { - oldHost->Send(new RenderViewObserverHelper_ClearScripts(oldHost->GetRoutingID())); + if (oldHost) + oldHost->Send(new RenderViewObserverHelper_ClearScripts(oldHost->GetRoutingID())); content::WebContents *contents = web_contents(); Q_FOREACH (const UserScript &script, m_controllerHost->m_perContentsScripts.value(contents)) |