diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-10-20 14:00:15 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-10-21 09:50:00 +0000 |
| commit | 98ee9d83c6aa3bdb800429c84a51c8086c9ef780 (patch) | |
| tree | 3db361b0f420a3fbfcd919818f84334ed127f032 /src/core | |
| parent | d8a1d110be018ae53a35b8cfd3b2ca67ee5449b0 (diff) | |
Fix crash in triggerDialog() in shutdown phase
Task-number: QTBUG-48645
Change-Id: I3dafce799ad70436d50ce8dbc936ea34a6ed4a61
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/resource_dispatcher_host_delegate_qt.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/core/resource_dispatcher_host_delegate_qt.cpp b/src/core/resource_dispatcher_host_delegate_qt.cpp index e6c513bf6..0213daa3a 100644 --- a/src/core/resource_dispatcher_host_delegate_qt.cpp +++ b/src/core/resource_dispatcher_host_delegate_qt.cpp @@ -100,7 +100,10 @@ bool ResourceDispatcherHostLoginDelegateQt::isProxy() const void ResourceDispatcherHostLoginDelegateQt::triggerDialog() { Q_ASSERT(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); - content::RenderViewHost* renderViewHost = content::RenderFrameHost::FromID(m_renderProcessId, m_renderFrameId)->GetRenderViewHost(); + content::RenderFrameHost *renderFrameHost = content::RenderFrameHost::FromID(m_renderProcessId, m_renderFrameId); + if (!renderFrameHost) + return; + content::RenderViewHost *renderViewHost = renderFrameHost->GetRenderViewHost(); content::WebContentsImpl *webContents = static_cast<content::WebContentsImpl *>(content::WebContents::FromRenderViewHost(renderViewHost)); WebContentsAdapterClient *client = WebContentsViewQt::from(webContents->GetView())->client(); |