Bug 1364167 - Backed out changeset 42e6d3683bda for causing a blank thread pane after repair folder. a=backout DONTBUILD
authorJorg K <jorgk@jorgk.com>
Sun, 24 Nov 2019 00:20:11 +0100
changeset 37300 a67ce4c2f2bc92c519b2e9b8ca65a8c337f1e0f2
parent 37299 64d30069741e189b6ee137d566ad5dcfa2c4729a
child 37301 4d04cbf78f1d26c376a078da6b1e930c4aabe8c8
push id395
push userclokep@gmail.com
push dateMon, 02 Dec 2019 19:38:57 +0000
reviewersbackout
bugs1364167
Bug 1364167 - Backed out changeset 42e6d3683bda for causing a blank thread pane after repair folder. a=backout DONTBUILD
mail/base/content/folderPane.js
--- a/mail/base/content/folderPane.js
+++ b/mail/base/content/folderPane.js
@@ -2934,19 +2934,17 @@ var gFolderTreeController = {
         // Remove the offline store, if any.
         let offlineStore = folder.filePath;
         // XXX todo: figure out how to delete a maildir directory async. This
         // delete causes main thread lockup for large maildir folders.
         if (offlineStore.exists()) {
           offlineStore.remove(true);
         }
       }
-      if (gFolderDisplay.displayedFolder == folder) {
-        gFolderDisplay.view.close();
-      }
+      gFolderDisplay.view.close();
 
       // Send a notification that we are triggering a database rebuild.
       MailServices.mfn.notifyItemEvent(
         folder,
         "FolderReindexTriggered",
         null,
         null
       );
@@ -2957,19 +2955,17 @@ var gFolderTreeController = {
       msgDB.summaryValid = false;
       try {
         folder.closeAndBackupFolderDB("");
       } catch (e) {
         // In a failure, proceed anyway since we're dealing with problems
         folder.ForceDBClosed();
       }
       folder.updateFolder(msgWindow);
-      if (gFolderDisplay.displayedFolder == folder) {
-        gFolderDisplay.show(folder);
-      }
+      gFolderDisplay.show(folder);
     }
 
     window.openDialog(
       "chrome://messenger/content/folderProps.xul",
       "",
       "chrome,modal,centerscreen",
       {
         folder,