From e00f0abe6a92a9112a970b4f4953cfbfd05be622 Mon Sep 17 00:00:00 2001 From: "naving%netscape.com" Date: Wed, 27 Feb 2002 02:30:58 +0000 Subject: [PATCH] 113128 r=bienvenu sr=mscott a=roc+moz fix deleting/moving local folders on mac --- mailnews/local/src/nsLocalMailFolder.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mailnews/local/src/nsLocalMailFolder.cpp b/mailnews/local/src/nsLocalMailFolder.cpp index fe6415d7b4a..38b54a91333 100644 --- a/mailnews/local/src/nsLocalMailFolder.cpp +++ b/mailnews/local/src/nsLocalMailFolder.cpp @@ -2061,12 +2061,13 @@ nsMsgLocalMailFolder::CopyFolderLocal(nsIMsgFolder *srcFolder, PRBool isMoveFold if (msgParent) { msgParent->PropagateDelete(srcFolder, PR_FALSE, msgWindow); // The files have already been moved, so delete storage PR_FALSE - oldPath.Delete(PR_TRUE); //berkeley mailbox - summarySpec.Delete(PR_TRUE); //msf file - if (!oldPath.IsDirectory()) + oldPath.Delete(PR_FALSE); //berkeley mailbox + summarySpec.Delete(PR_FALSE); //msf file + if (!oldPath.IsDirectory()) //folder path cannot be directory but still check it to be safe { AddDirectorySeparator(oldPath); - oldPath.Delete(PR_TRUE); //delete the .sbd directory and it's content. All subfolders have been moved + if (oldPath.IsDirectory()) + oldPath.Delete(PR_TRUE); //delete the .sbd directory and it's content. All subfolders have been moved } } }