Bug 346447: loadFolderAndReplace=false ignores "loading" tabs, patch by Pablo Greco <pablo@fliagreco.com.ar>, r=mano

browser/components/bookmarks/content/bookmarks.js

@@ -799,9 +799,12 @@ var BookmarksCommand = {
       if (doReplace)
         index0 = 0;
       else {
-        for (index0=tabCount-1; index0>=0; --index0)
-          if (tabPanels[index0].webNavigation.currentURI.spec != "about:blank")
+        for (index0=tabCount-1; index0>=0; --index0) {
+          var tab = tabPanels[index0];
+          if (tab.webNavigation.currentURI.spec != "about:blank" ||
+              tab.webProgress.isLoadingDocument)
             break;
+        }
         ++index0;
       }
 

browser/components/places/content/controller.js

@@ -1386,9 +1386,12 @@ var PlacesController = {
         firstIndex = 0;
       // If the pref is not set, only load over the blank tabs at the end, if any.
       else {
-        for (firstIndex = tabCount - 1; firstIndex >= 0; --firstIndex)
-          if (browser.browsers[firstIndex].currentURI.spec != "about:blank")
+        for (firstIndex = tabCount - 1; firstIndex >= 0; --firstIndex) {
+          var br = browser.browsers[firstIndex];
+          if (br.currentURI.spec != "about:blank" ||
+              br.webProgress.isLoadingDocument)
             break;
+        }
         ++firstIndex;
       }