зеркало из https://github.com/mozilla/gecko-dev.git
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
This commit is contained in:
Родитель
c29de605ca
Коммит
a5d65afbfd
|
@ -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();
|
||||
|
|
Загрузка…
Ссылка в новой задаче