From 61541404bcf216330cc081964dade9b2427e8491 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 8 Apr 2014 11:49:14 +0200 Subject: Fix crash in qt_try_modal. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-34580 Change-Id: Idc549116fa99aa49ac7c67dcfc76d32ca71f3c76 Reviewed-by: Jan Arve Sæther --- src/widgets/kernel/qapplication_qpa.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/widgets/kernel/qapplication_qpa.cpp') diff --git a/src/widgets/kernel/qapplication_qpa.cpp b/src/widgets/kernel/qapplication_qpa.cpp index 5a4a4591bf..c68bcc773f 100644 --- a/src/widgets/kernel/qapplication_qpa.cpp +++ b/src/widgets/kernel/qapplication_qpa.cpp @@ -93,7 +93,6 @@ bool qt_try_modal(QWidget *widget, QEvent::Type type) return true; bool block_event = false; - bool paint_event = false; switch (type) { #if 0 @@ -113,7 +112,7 @@ bool qt_try_modal(QWidget *widget, QEvent::Type type) break; } - if ((block_event || paint_event) && top->parentWidget() == 0) + if (block_event && top && top->parentWidget() == 0) top->raise(); return !block_event; -- cgit v1.2.3