Fix could not write installer configuration file.

Task-number: QTIFW-621
Change-Id: Iad160efc3c9123476d0fd0d676a0ce751025778a
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Christoph Vogtländer <c.vogtlaender@sigma-surface-science.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>

1 files changed, 5 insertions, 4 deletions

diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp
index 5ccf2f82d..98d329ae4 100644
--- a/src/libs/installer/packagemanagercore_p.cpp
+++ b/src/libs/installer/packagemanagercore_p.cpp
@@ -1352,6 +1352,8 @@ void PackageManagerCorePrivate::writeMaintenanceTool(OperationList performedOper
             QInstaller::appendInt64(&file, BinaryContent::MagicCookie);
         }
         input.close();
+        if (m_core->isInstaller())
+            registerMaintenanceTool();
         writeMaintenanceConfigFiles();
         deferredRename(dataFile + QLatin1String(".new"), dataFile, false);
 
@@ -1381,13 +1383,13 @@ QString PackageManagerCorePrivate::registerPath()
 #ifdef Q_OS_WIN
     QString guid = m_data.value(scProductUUID).toString();
     if (guid.isEmpty()) {
-        m_data.setValue(scProductUUID, QUuid::createUuid().toString());
-        guid = m_data.value(scProductUUID).toString();
+        guid = QUuid::createUuid().toString();
+        m_data.setValue(scProductUUID, guid);
         writeMaintenanceConfigFiles(); // save uuid persistently
     }
 
     QString path = QLatin1String("HKEY_CURRENT_USER");
-    if (m_data.value(QLatin1String("AllUsers")).toString() == scTrue)
+    if (m_data.value(QLatin1String("AllUsers"), scFalse).toString() == scTrue)
         path = QLatin1String("HKEY_LOCAL_MACHINE");
 
     return path + QLatin1String("\\Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\")
@@ -1547,7 +1549,6 @@ bool PackageManagerCorePrivate::runInstaller()
         emit m_core->titleMessageChanged(tr("Creating Maintenance Tool"));
 
         writeMaintenanceTool(m_performedOperationsOld + m_performedOperationsCurrentSession);
-        registerMaintenanceTool();
 
         // fake a possible wrong value to show a full progress bar
         const int progress = ProgressCoordinator::instance()->progressInPercentage();