From 27210e9602c37dc3e9891e12854b78c17401d78b Mon Sep 17 00:00:00 2001
From: "putterman%netscape.com"
 <putterman%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 21 Sep 1999 21:04:52 +0000
Subject: [PATCH] Only reroot if the folder notification we receive is for the
 folder that's currently the loading folder.

git-svn-id: svn://10.0.0.236/trunk@48615 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../base/resources/content/commandglue.js      |  1 +
 .../resources/content/msgMail3PaneWindow.js    | 18 +++++++-----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/mozilla/mailnews/base/resources/content/commandglue.js b/mozilla/mailnews/base/resources/content/commandglue.js
index 1344abc086d..979dcfe2094 100644
--- a/mozilla/mailnews/base/resources/content/commandglue.js
+++ b/mozilla/mailnews/base/resources/content/commandglue.js
@@ -197,6 +197,7 @@ function ChangeFolderByURI(uri)
   {
 	try
 	{
+		gCurrentLoadingFolderURI = uri;
 		msgfolder.StartFolderLoading();
 		msgfolder.UpdateFolder();
 	}
diff --git a/mozilla/mailnews/base/resources/content/msgMail3PaneWindow.js b/mozilla/mailnews/base/resources/content/msgMail3PaneWindow.js
index e51d3af4449..c2d77efbe13 100644
--- a/mozilla/mailnews/base/resources/content/msgMail3PaneWindow.js
+++ b/mozilla/mailnews/base/resources/content/msgMail3PaneWindow.js
@@ -34,6 +34,7 @@ var messageDSProgID        = datasourceProgIDPrefix + "mailnewsmessages";
 
 var gFolderTree;
 var gThreadTree;
+var gCurrentLoadingFolderURI
 
 // get the messenger instance
 var messenger = Components.classes[messengerProgID].createInstance();
@@ -70,18 +71,13 @@ var folderListener = {
 			if(resource)
 			{
 				var uri = resource.Value;
-				var folderTree = GetFolderTree();
-				var selArray = folderTree.selectedItems;
-				if ( selArray && (selArray.length == 1) )
+				if(uri == gCurrentLoadingFolderURI)
 				{
-					var id = selArray[0].getAttribute('id');
-					if(uri == id)
-					{
-						var msgFolder = folder.QueryInterface(Components.interfaces.nsIMsgFolder);
-						if(msgFolder)
-							msgFolder.EndFolderLoading();
-						RerootFolder(uri);
-					}
+					gCurrentLoadingFolderURI="";
+					var msgFolder = folder.QueryInterface(Components.interfaces.nsIMsgFolder);
+					if(msgFolder)
+						msgFolder.EndFolderLoading();
+					RerootFolder(uri);
 				}
 			}
 		}