From a5d65afbfdd5a3f20dbcccafe30db2eeb8b0f017 Mon Sep 17 00:00:00 2001
From: "bienvenu%nventure.com" <bienvenu%nventure.com>
Date: Sat, 3 Apr 2004 23:46:08 +0000
Subject: [PATCH] fix crash on exit if hidden pref to confirm folder deletion
 on empty imap trash is set, and there are sub-folders of the trash,
 sr=mscott, a=chofmann 239473

---
 mailnews/imap/src/nsImapMailFolder.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/mailnews/imap/src/nsImapMailFolder.cpp b/mailnews/imap/src/nsImapMailFolder.cpp
index efec5062b8b7..5f1854eb7ba8 100644
--- a/mailnews/imap/src/nsImapMailFolder.cpp
+++ b/mailnews/imap/src/nsImapMailFolder.cpp
@@ -1284,8 +1284,11 @@ NS_IMETHODIMP nsImapMailFolder::EmptyTrash(nsIMsgWindow *aMsgWindow,
               IMAPGetStringByID(IMAP_EMPTY_TRASH_CONFIRM, getter_Copies(confirmationStr));
               promptService = do_GetService("@mozilla.org/embedcomp/prompt-service;1");
               nsCOMPtr<nsIDocShell> docShell;
-	      (void) aMsgWindow->GetRootDocShell(getter_AddRefs(docShell));
-   	      parentWindow = do_QueryInterface(docShell);
+              if (aMsgWindow)
+              {
+	              (void) aMsgWindow->GetRootDocShell(getter_AddRefs(docShell));
+   	            parentWindow = do_QueryInterface(docShell);
+              }
               rv = IMAPGetStringBundle(getter_AddRefs(bundle));
               NS_ENSURE_SUCCESS(rv, rv);
             rv = aEnumerator->First();