Bug 342632 - Allow defaultAccount to return success with nullptr result when there is no usable account.

Tag #1273
This commit is contained in:
Matt A. Tobin 2019-11-10 22:51:10 -05:00 • committed by Roy Tam
commit af2693fe73
11 changed files with 121 additions and 101 deletions

View file

@ -770,9 +770,16 @@ nsBeckyFilters::CollectServers()
nsCOMPtr<nsIMsgAccount> defaultAccount;
rv = accountManager->GetDefaultAccount(getter_AddRefs(defaultAccount));
NS_ENSURE_SUCCESS(rv, rv);
if (defaultAccount)
return defaultAccount->GetIncomingServer(getter_AddRefs(mServer));
nsCOMPtr<nsIMsgIncomingServer> server;
return defaultAccount->GetIncomingServer(getter_AddRefs(mServer));
// We can also import filters into the Local Folders account.
rv = accountManager->GetLocalFoldersServer(getter_AddRefs(mServer));
NS_ENSURE_SUCCESS(rv, rv);
if (!mServer)
return NS_ERROR_UNEXPECTED;
return NS_OK;
}
nsresult