Revert "Fixes: NB#182427, Adding an action to an AppPage and then setting its widgets causes a crash"

This reverts commit ed2e3fe1b50725228de1b96915a3e5acfcd25ab6.

Details: This introduced NB#184199

1 files changed, 14 insertions, 12 deletions

diff --git a/src/views/mapplicationmenuview.cpp b/src/views/mapplicationmenuview.cpp
index bad6d84d..a304fc0e 100644
--- a/src/views/mapplicationmenuview.cpp
+++ b/src/views/mapplicationmenuview.cpp
@@ -207,26 +207,28 @@ void MApplicationMenuViewPrivate::addActions()
 
 MWidget *MApplicationMenuViewPrivate::createWidget(QAction *action)
 {
-    MWidget * widget = getWidget(action);
-    widget = widget ? widget : requestWidget(qobject_cast<MAction *>(action));
-
     // If widget is not already created then create it
+    MWidget *widget = buttons.value(action);
     if (!widget) {
-        widget = createButton(action);
-        buttons.insert(action,widget);
+        widget = leasedWidgets.value(action);
     }
-    else {
-        MComboBox *comboBox = qobject_cast<MComboBox *>(widget);
-        if (comboBox) {
-            connect(comboBox, SIGNAL(clicked()), action, SIGNAL(triggered()));
+    if (!widget) {
+        MWidgetAction *widgetAction = qobject_cast<MWidgetAction *>(action);
+        if (widgetAction) {
+            widget = requestWidget(widgetAction);
+            MComboBox *comboBox = qobject_cast<MComboBox *>(widget);
+            if (comboBox) {
+                connect(comboBox, SIGNAL(clicked()), widgetAction, SIGNAL(triggered()));
+            }
+            leasedWidgets.insert(action, widget);
+        } else {
+            widget = createButton(action);
+            buttons.insert(action, widget);
         }
-        leasedWidgets.insert(action, widget);
     }
-
     connect(action, SIGNAL(triggered()), controller, SLOT(disappear()));
     widget->setVisible(true);
     widget->setEnabled(action->isEnabled());
-
     return widget;
 }