Allow disabling undo in RegisterFileType operation during uninstall

Task-number: QTIFW-2089
Change-Id: I8cccd471718eaaa6dc167a852b8854dc424f994e
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>

1 files changed, 4 insertions, 2 deletions

diff --git a/src/libs/installer/registerfiletypeoperation.cpp b/src/libs/installer/registerfiletypeoperation.cpp
index 0a7c2eaa5..c1ee7a038 100644
--- a/src/libs/installer/registerfiletypeoperation.cpp
+++ b/src/libs/installer/registerfiletypeoperation.cpp
@@ -97,7 +97,7 @@ bool RegisterFileTypeOperation::performOperation()
     ensureOptionalArgumentsRead();
     if (!checkArgumentCount(2, 5, QString::fromLatin1("<extension> <command> [description [contentType [icon]]]")))
         return false;
-    QStringList args = arguments();
+    QStringList args = parsePerformOperationArguments();
 
     bool allUsers = false;
     PackageManagerCore *const core = packageManager();
@@ -153,8 +153,10 @@ bool RegisterFileTypeOperation::undoOperation()
 {
 #ifdef Q_OS_WIN
     ensureOptionalArgumentsRead();
-    QStringList args = arguments();
+    if (parseUndoOperationArguments().count() > 0)
+        return true;
 
+    QStringList args = arguments();
     if (!checkArgumentCount(2, 5, tr("Register File Type: Invalid arguments")))
         return false;