1 files changed, 6 insertions, 4 deletions
diff --git a/src/libs/installer/extractarchiveoperation.cpp b/src/libs/installer/extractarchiveoperation.cpp
index 162bd1609..b00a67190 100644
--- a/src/libs/installer/extractarchiveoperation.cpp
+++ b/src/libs/installer/extractarchiveoperation.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-** Copyright (C) 2022 The Qt Company Ltd.
+** Copyright (C) 2023 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Installer Framework.
@@ -103,7 +103,7 @@ void ExtractArchiveOperation::backup()
         return;
     }
 
-    const bool hasAdminRights = (AdminAuthorization::hasAdminRights() || RemoteClient::instance().isActive());
+    const bool hasAdminRights = (packageManager() && packageManager()->hasAdminRights());
     const bool canCreateSymLinks = QInstaller::canCreateSymbolicLinks();
     bool needsAdminRights = false;
 
@@ -215,7 +215,8 @@ bool ExtractArchiveOperation::performOperation()
             }
             files[i] = replacePath(files.at(i), installDir, QLatin1String(scRelocatable));
         }
-        out << files;
+        if (!files.isEmpty())
+            out << files;
         setValue(QLatin1String("files"), file.fileName());
         file.close();
     } else {
@@ -253,7 +254,8 @@ bool ExtractArchiveOperation::undoOperation()
         if (!readDataFileContents(targetDir, &files))
             return false;
     }
-    startUndoProcess(files);
+    if (!files.isEmpty())
+        startUndoProcess(files);
     if (!useStringListType)
         deleteDataFile(m_relocatedDataFileName);