From 95a8297888fbabfa2883f644fdd08becaa8dccae Mon Sep 17 00:00:00 2001
From: Kenneth Skovhede <kenneth@duplicati.com>
Date: Fri, 20 Jun 2025 17:08:07 +0200
Subject: [PATCH] More handling of encryption passphrase

This fixes #6318
---
 .../controllers/RestoreDirectController.js       | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/Duplicati/Server/webroot/ngax/scripts/controllers/RestoreDirectController.js b/Duplicati/Server/webroot/ngax/scripts/controllers/RestoreDirectController.js
index a39d303db..5b9906446 100644
--- a/Duplicati/Server/webroot/ngax/scripts/controllers/RestoreDirectController.js
+++ b/Duplicati/Server/webroot/ngax/scripts/controllers/RestoreDirectController.js
@@ -42,14 +42,20 @@ backupApp.controller('RestoreDirectController', function ($rootScope, $scope, $l
             var opts = {};
             var obj = {'Backup': {'TargetURL':  $scope.TargetURL } };
 
-            if (($scope.EncryptionPassphrase || '') == '')
-                opts['--no-encryption'] = 'true';
-            else
-                opts['passphrase'] = $scope.EncryptionPassphrase;
-
             if (!AppUtils.parse_extra_options($scope.ExtendedOptions, opts))
                 return false;
 
+            if (($scope.EncryptionPassphrase || '') == '')
+            {
+                opts['--no-encryption'] = 'true';
+                delete opts['passphrase'];
+            }
+            else
+            {
+                opts['passphrase'] = $scope.EncryptionPassphrase;
+                delete opts['--no-encryption'];
+            }
+
             obj.Backup.Settings = [];
             for(var k in opts) {
                 obj.Backup.Settings.push({