From 1a7ca450fdb593e24d00fc91e76e9669c327c1de Mon Sep 17 00:00:00 2001
From: "naving%netscape.com" <naving%netscape.com>
Date: Tue, 1 Oct 2002 00:25:49 +0000
Subject: [PATCH] 171711 r=cavin sr=bienvenu fixing regression delete in
 standalone mode works only once.

---
 mailnews/base/resources/content/messageWindow.js | 4 +++-
 mailnews/base/src/nsMsgDBView.cpp                | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/mailnews/base/resources/content/messageWindow.js b/mailnews/base/resources/content/messageWindow.js
index deabf293cef7..2c7a3a0a9373 100644
--- a/mailnews/base/resources/content/messageWindow.js
+++ b/mailnews/base/resources/content/messageWindow.js
@@ -175,6 +175,7 @@ function HandleDeleteOrMoveMsgCompleted(folder)
 	var folderUri = folderResource.Value;
 	if((folderUri == gCurrentFolderUri) && gCurrentMessageIsDeleted)
 	{
+    gDBView.onDeleteCompleted(true);
     gCurrentMessageIsDeleted = false;
     if (gNextMessageViewIndexAfterDelete != nsMsgKey_None) 
     {
@@ -201,6 +202,7 @@ function HandleDeleteOrMoveMsgFailed(folder)
      return;
 
   var folderUri = folderResource.Value;
+  gDBView.onDeleteCompleted(false);
   if((folderUri == gCurrentFolderUri) && gCurrentMessageIsDeleted)
   {
     gCurrentMessageIsDeleted = false;
@@ -210,7 +212,7 @@ function HandleDeleteOrMoveMsgFailed(folder)
 function OnLoadMessageWindow()
 {
 	HideMenus();
-  	AddMailOfflineObserver();
+  AddMailOfflineObserver();
 	CreateMailWindowGlobals();
 	CreateMessageWindowGlobals();
 	verifyAccounts(null);
diff --git a/mailnews/base/src/nsMsgDBView.cpp b/mailnews/base/src/nsMsgDBView.cpp
index ff46dd554110..e06a6f31e96c 100644
--- a/mailnews/base/src/nsMsgDBView.cpp
+++ b/mailnews/base/src/nsMsgDBView.cpp
@@ -5030,7 +5030,7 @@ nsMsgDBView::OnDeleteCompleted(PRBool aSucceeded)
 {
   if (m_deletingRows)
   { 
-    if (aSucceeded)
+    if (aSucceeded && mTreeSelection)
     {
 
       PRInt32 selectionCount;