diff options
| author | Robert Griebl <robert.griebl@pelagicore.com> | 2016-12-19 14:26:06 +0100 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@pelagicore.com> | 2016-12-19 13:43:47 +0000 |
| commit | c9ba2178388b6a1b68eae69709d989d6d4f19d9b (patch) | |
| tree | 2ed949b83d9b35889b2e627737a7bcf2dee719fc | |
| parent | 61f9a3fd6974ec0c644d32519baa566a35ec48f2 (diff) | |
Fix nullptr crash introduced in 4e7af89
This occurred with any system-ui using the qtapplicationmanager when
trying to show the first window of an application.
Change-Id: Ifec4626269f30f91cd0f4e29871d33747d9b2374
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com>
| -rw-r--r-- | src/compositor/compositor_api/qwaylandquickitem.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/compositor/compositor_api/qwaylandquickitem.cpp b/src/compositor/compositor_api/qwaylandquickitem.cpp index 1752fa98e..9ec000c84 100644 --- a/src/compositor/compositor_api/qwaylandquickitem.cpp +++ b/src/compositor/compositor_api/qwaylandquickitem.cpp @@ -1266,8 +1266,10 @@ void QWaylandQuickItem::handleDragStarted(QWaylandDrag *drag) d->isDragging = true; } -qreal QWaylandQuickItemPrivate::scaleFactor() const { - return (view->output() ? view->output()->scaleFactor() : 1) / window->devicePixelRatio(); +qreal QWaylandQuickItemPrivate::scaleFactor() const +{ + return (view->output() ? view->output()->scaleFactor() : 1) + / (window ? window->devicePixelRatio() : 1); } QT_END_NAMESPACE |