summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/libs/installer/packagemanagergui.cpp8
-rw-r--r--src/sdk/tabcontroller.cpp5
2 files changed, 7 insertions, 6 deletions
diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp
index e3dc65d58..3b7b3b178 100644
--- a/src/libs/installer/packagemanagergui.cpp
+++ b/src/libs/installer/packagemanagergui.cpp
@@ -1970,12 +1970,8 @@ void StartMenuDirectoryPage::leaving()
void StartMenuDirectoryPage::currentItemChanged(QListWidgetItem *current)
{
- if (current) {
- QString dir = current->data(Qt::DisplayRole).toString();
- if (!dir.isEmpty())
- dir += QDir::separator();
- setStartMenuDir(dir + packageManagerCore()->value(scStartMenuDir));
- }
+ if (current)
+ setStartMenuDir(current->data(Qt::DisplayRole).toString());
}
diff --git a/src/sdk/tabcontroller.cpp b/src/sdk/tabcontroller.cpp
index 9234b5549..035622dfb 100644
--- a/src/sdk/tabcontroller.cpp
+++ b/src/sdk/tabcontroller.cpp
@@ -164,6 +164,11 @@ void TabController::restartWizard()
d->m_core->networkSettingsChanged();
}
+ // Make sure we are writing the .dat file with the list of uninstall operations already now.
+ // Otherwise we will write at the end of the next updater run, with a potentially
+ // empty component list (if no updates are found).
+ d->m_core->writeMaintenanceTool();
+
// restart and switch back to intro page
QTimer::singleShot(0, this, SLOT(init()));
}