Move the restart of the wizard into installer base.

Also clear some more labels on restart or after new setings.

Change-Id: I3a3727b0d4f2f43e13aafa5f6e499ac74277774c
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>

2 files changed, 12 insertions, 5 deletions

diff --git a/installerbuilder/installerbase/tabcontroller.cpp b/installerbuilder/installerbase/tabcontroller.cpp
index a2d9dcd6b..8276e37d1 100644
--- a/installerbuilder/installerbase/tabcontroller.cpp
+++ b/installerbuilder/installerbase/tabcontroller.cpp
@@ -134,9 +134,13 @@ int TabController::init()
 
     IntroductionPageImpl *page =
         qobject_cast<IntroductionPageImpl*> (d->m_gui->page(PackageManagerCore::Introduction));
-    if (page)
+    if (page) {
+        page->setMessage(QString());
+        page->setErrorMessage(QString());
         page->onCoreNetworkSettingsChanged();
+    }
 
+    d->m_gui->restart();
     d->m_gui->setWindowModality(Qt::WindowModal);
     d->m_gui->show();
 
@@ -176,8 +180,13 @@ void TabController::onSettingsButtonClicked()
 
     if (d->m_networkSettingsChanged) {
         d->m_core->setCanceled();
-        QTimer::singleShot(0, d->m_gui, SLOT(restart()));
-        QTimer::singleShot(100, this, SLOT(restartWizard()));
+        IntroductionPageImpl *page =
+            qobject_cast<IntroductionPageImpl*> (d->m_gui->page(PackageManagerCore::Introduction));
+        if (page) {
+            page->setMessage(QString());
+            page->setErrorMessage(QString());
+        }
+        restartWizard();
     }
 }
 
diff --git a/installerbuilder/libinstaller/packagemanagergui.cpp b/installerbuilder/libinstaller/packagemanagergui.cpp
index f6779276b..41fa7fa9b 100644
--- a/installerbuilder/libinstaller/packagemanagergui.cpp
+++ b/installerbuilder/libinstaller/packagemanagergui.cpp
@@ -1962,8 +1962,6 @@ void RestartPage::entering()
     if (!packageManagerCore()->needsRestart()) {
         if (QAbstractButton *finish = wizard()->button(QWizard::FinishButton))
             finish->setVisible(false);
-
-        wizard()->restart();
         QMetaObject::invokeMethod(this, "restart", Qt::QueuedConnection);
     } else {
         gui()->accept();