Fixes: NB#165741, duicontrolpanel crashes sometimes after tapping connect in WLAN security key dialog

RevBy: Michael Hasselman
Details:
Use of single shot timers to trigger _q_inputPanelOpened() and
_q_inputPanelClosed() is dangerous and not a good idea.

This software input panel code in MSceneManager really needs
refactoring.

Also usage of nested main loops such as MDialog::exec() in general
can bring some nasty scenarios.

2 files changed, 5 insertions, 2 deletions

diff --git a/src/corelib/scene/mscenemanager.cpp b/src/corelib/scene/mscenemanager.cpp
index a5215773..cc651bce 100644
--- a/src/corelib/scene/mscenemanager.cpp
+++ b/src/corelib/scene/mscenemanager.cpp
@@ -1199,6 +1199,9 @@ void MSceneManagerPrivate::_q_inputPanelOpened()
 {
     Q_Q(MSceneManager);
 
+    if (!focusedInputWidget)
+        return;
+
     const bool widgetOnPage = onApplicationPage(focusedInputWidget);
     if (navBar && widgetOnPage) {
         navBarHidden = true;
diff --git a/src/corelib/scene/mscenemanager_p.h b/src/corelib/scene/mscenemanager_p.h
index 24aae9f1..5bcf122e 100644
--- a/src/corelib/scene/mscenemanager_p.h
+++ b/src/corelib/scene/mscenemanager_p.h
@@ -171,9 +171,9 @@ public:
     bool navBarHidden;
     bool escapeButtonHidden;
 
-    QGraphicsItem *focusedInputWidget;
+    QPointer<QGraphicsWidget> focusedInputWidget;
 
-    MSceneWindow *alteredSceneWindow;
+    QPointer<MSceneWindow> alteredSceneWindow;
     QPoint sceneWindowTranslation;
 
     bool pendingSIPClose;