From 6c4aa14ecc6a1be7ea27dadda9e289c27c37f9b9 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 19 Oct 2011 10:29:01 +0200 Subject: Widgets: Fix a startup crash in QSplashScreen (Linguist). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I38f5920fb62277f97e9b3b45651527c2475556ac Reviewed-by: Samuel Rødal --- src/widgets/kernel/qwidget.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index de4ae0a5d3..8e3fd48546 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -1180,8 +1180,9 @@ void QWidgetPrivate::init(QWidget *parentWidget, Qt::WindowFlags f) } #elif defined(Q_WS_QPA) if (desktopWidget) { - int screen = desktopWidget->d_func()->topData()->screenIndex; - q->windowHandle()->setScreen(QGuiApplication::screens().value(screen, 0)); + const int screen = desktopWidget->d_func()->topData()->screenIndex; + if (QWindow *window = q->windowHandle()) + window->setScreen(QGuiApplication::screens().value(screen, 0)); } #else Q_UNUSED(desktopWidget); -- cgit v1.2.3