diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
commit | fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 (patch) | |
tree | 4c1ccaf5486d4f2009f9a338a98a83e886e29c97 /browser/components/migration/MigrationUtils.sys.mjs | |
parent | Releasing progress-linux version 124.0.1-1~progress7.99u1. (diff) | |
download | firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.tar.xz firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.zip |
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'browser/components/migration/MigrationUtils.sys.mjs')
-rw-r--r-- | browser/components/migration/MigrationUtils.sys.mjs | 3 |
1 files changed, 2 insertions, 1 deletions
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) { |