From e91c47846bcbbab0f018394509c9724de0b1d6b9 Mon Sep 17 00:00:00 2001
From: Raymond Hill <gorhill@users.noreply.github.com>
Date: Sun, 28 Sep 2025 15:04:26 -0400
Subject: [PATCH] [mv3] Fix issues with restore from file

---
 platform/mv3/extension/js/backup-restore.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/platform/mv3/extension/js/backup-restore.js b/platform/mv3/extension/js/backup-restore.js
index 75e548d54..b8559b1cf 100644
--- a/platform/mv3/extension/js/backup-restore.js
+++ b/platform/mv3/extension/js/backup-restore.js
@@ -20,7 +20,7 @@
 */
 
 import {
-    localRead, localWrite,
+    localRead, localRemove, localWrite,
     runtime,
     sendMessage,
 } from './ext.js';
@@ -101,7 +101,7 @@ export async function restoreFromObject(targetConfig) {
     });
 
     const enabledRulesets = new Set(defaultConfig.rulesets);
-    for ( const entry of targetConfig.rulesets ) {
+    for ( const entry of targetConfig.rulesets || [] ) {
         const id = entry.slice(1);
         if ( entry.startsWith('+') ) {
             enabledRulesets.add(id);
@@ -143,7 +143,11 @@ export async function restoreFromObject(targetConfig) {
     await Promise.all(promises);
 
     const dnrRules = targetConfig.dnrRules ?? [];
-    await localWrite('userDnrRules', dnrRules.join('\n'));
+    if ( dnrRules.length !== 0 ) {
+        await localWrite('userDnrRules', dnrRules.join('\n'));
+    } else {
+        await localRemove('userDnrRules');
+    }
     await sendMessage({ what: 'updateUserDnrRules' });
 
 }