Fix race condition when loading redirect/scriptlet resources

Related feedback: uBlockOrigin/uAssets#23806 (comment)
gorhill · Jun 26, 2024 · 896737d · 896737d
1 parent 6b349ca
commit 896737d
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/js/storage.js b/src/js/storage.js
@@ -1008,12 +1008,12 @@ onBroadcast(msg => {
         ubolog('loadFilterLists() Start');
         t0 = Date.now();
         loadedListKeys.length = 0;
-        loadingPromise = Promise.all([
-            this.getAvailableLists().then(lists => onFilterListsReady(lists)),
-            this.loadRedirectResources().then(( ) => {
-                ubolog(`loadFilterLists() Redirects/scriptlets ready at ${elapsed()}`);
-            }),
-        ]).then(( ) => {
+        loadingPromise = this.loadRedirectResources().then(( ) => {
+            ubolog(`loadFilterLists() Redirects/scriptlets ready at ${elapsed()}`);
+            return this.getAvailableLists();
+        }).then(lists => {
+            return onFilterListsReady(lists)
+        }).then(( ) => {
             onDone();
         });
         return loadingPromise;