From a9539192f9ab33169b57a62b987c45aa5ee762e3 Mon Sep 17 00:00:00 2001 From: "bienvenu%netscape.com" Date: Mon, 23 Dec 2002 22:43:09 +0000 Subject: [PATCH] fix regression in delete immediately imap delete r/sr=sspitzer 186560 git-svn-id: svn://10.0.0.236/trunk@135601 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/mailnews/base/src/nsMsgDBView.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mozilla/mailnews/base/src/nsMsgDBView.cpp b/mozilla/mailnews/base/src/nsMsgDBView.cpp index 58974e18b93..43028f8df08 100644 --- a/mozilla/mailnews/base/src/nsMsgDBView.cpp +++ b/mozilla/mailnews/base/src/nsMsgDBView.cpp @@ -2313,9 +2313,11 @@ nsresult nsMsgDBView::DeleteMessages(nsIMsgWindow *window, nsMsgViewIndex *indic messageArray->AppendElement(msgHdr); } - rv = m_folder->DeleteMessages(messageArray, window, deleteStorage, PR_FALSE, nsnull, PR_TRUE /*allow Undo*/ ); - if (NS_SUCCEEDED(rv) && mDeleteModel != nsMsgImapDeleteModels::IMAPDelete) + if (mDeleteModel != nsMsgImapDeleteModels::IMAPDelete) m_deletingRows = PR_TRUE; + rv = m_folder->DeleteMessages(messageArray, window, deleteStorage, PR_FALSE, nsnull, PR_TRUE /*allow Undo*/ ); + if (NS_FAILED(rv)) + m_deletingRows = PR_FALSE; return rv; }