From 5d21f962db500a22697221d985709d5f24fa27f5 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sun, 10 Nov 2019 22:51:10 -0500 Subject: Bug 342632 - Allow defaultAccount to return success with nullptr result when there is no usable account. Tag #1273 --- mailnews/base/search/content/searchWidgets.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'mailnews/base/search/content') diff --git a/mailnews/base/search/content/searchWidgets.xml b/mailnews/base/search/content/searchWidgets.xml index 80ebe38c4..69f3b2ae2 100644 --- a/mailnews/base/search/content/searchWidgets.xml +++ b/mailnews/base/search/content/searchWidgets.xml @@ -224,10 +224,12 @@ let identitiesRaw = MailServices.accounts .getIdentitiesForServer(gFilterList.folder.server); let identities = Array.from(this.fixIterator(identitiesRaw, - Components.interfaces.nsIMsgIdentity)); + Ci.nsIMsgIdentity)); - if (!identities.length) // typically if this is Local Folders - identities.push(MailServices.accounts.defaultAccount.defaultIdentity); + if (identities.length == 0) { // typically if this is Local Folders + if (MailServices.accounts.defaultAccount) + identities.push(MailServices.accounts.defaultAccount.defaultIdentity); + } let templateFound = false; let foldersScanned = []; -- cgit v1.2.3