mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-26 03:35:33 +00:00
91651 r/sr=bienvenu. check for the number of messages to be deleted at the
start of the routine.
This commit is contained in:
parent
e9f444cd23
commit
92898f2b1c
@ -1482,6 +1482,11 @@ nsMsgLocalMailFolder::DeleteMessages(nsISupportsArray *messages,
|
||||
nsIMsgCopyServiceListener* listener, PRBool allowUndo)
|
||||
{
|
||||
nsresult rv = NS_ERROR_FAILURE;
|
||||
if (!messages) return rv;
|
||||
PRUint32 messageCount;
|
||||
rv = messages->Count(&messageCount);
|
||||
if (messageCount == 0) return rv;
|
||||
|
||||
PRBool isTrashFolder = mFlags & MSG_FOLDER_FLAG_TRASH;
|
||||
if (!deleteStorage && !isTrashFolder)
|
||||
{
|
||||
@ -1513,10 +1518,7 @@ nsMsgLocalMailFolder::DeleteMessages(nsISupportsArray *messages,
|
||||
rv = GetDatabase(msgWindow);
|
||||
if(NS_SUCCEEDED(rv))
|
||||
{
|
||||
PRUint32 messageCount;
|
||||
nsCOMPtr<nsISupports> msgSupport;
|
||||
rv = messages->Count(&messageCount);
|
||||
|
||||
DeleteMsgsOnPop3Server(messages);
|
||||
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
|
Loading…
Reference in New Issue
Block a user