From 086c044dc34dfc0f74fbe41f4ecb402b2cd34884 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 19 Apr 2024 03:13:33 +0200
Subject: Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 browser/components/migration/MigrationUtils.sys.mjs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'browser/components/migration/MigrationUtils.sys.mjs')

diff --git a/browser/components/migration/MigrationUtils.sys.mjs b/browser/components/migration/MigrationUtils.sys.mjs
index 000b471ee6..cda3028cc4 100644
--- a/browser/components/migration/MigrationUtils.sys.mjs
+++ b/browser/components/migration/MigrationUtils.sys.mjs
@@ -165,6 +165,7 @@ class MigrationUtils {
         "about:welcome",
         "about:welcome?*",
         "about:preferences",
+        "about:settings",
         "chrome://browser/content/migration/migration-dialog-window.html",
         "chrome://browser/content/spotlight.html",
         "about:firefoxview",
@@ -411,7 +412,7 @@ class MigrationUtils {
       });
 
     Services.tm.spinEventLoopUntil(
-      "MigrationUtils.jsm:MU_spinResolve",
+      "MigrationUtils.sys.mjs:MU_spinResolve",
       () => done || gForceExitSpinResolve
     );
     if (!done) {
-- 
cgit v1.2.3