diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-12-11 17:24:08 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-16 14:39:05 +0100 |
| commit | a9048cccf881504edcb4039160069dd870e1905d (patch) | |
| tree | e5cf391eab283b8993161c2c22002eb5c75ccdcc | |
| parent | 25355b4210284591661e22643321588749277f6d (diff) | |
Fix a crash when opening a window.
RenderWidgetHostViewQt::GetViewBounds gets called early than
RenderWidgetHostViewQt::setAdapterClient when a new window is created
by Chromium.
Change-Id: I5ad61fc54ae773200403b222110a1d0ad541f941
Reviewed-by: Arvid Nilsson <anilsson@blackberry.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
| -rw-r--r-- | src/core/render_widget_host_view_qt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp index 20c1dc4fe..e8d38d761 100644 --- a/src/core/render_widget_host_view_qt.cpp +++ b/src/core/render_widget_host_view_qt.cpp @@ -822,7 +822,7 @@ void RenderWidgetHostViewQt::RemoveExpiredMappings(QTouchEvent *ev) float RenderWidgetHostViewQt::dpiScale() const { - return m_adapterClient->dpiScale(); + return m_adapterClient ? m_adapterClient->dpiScale() : 1.0; } bool RenderWidgetHostViewQt::IsPopup() const |