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/import/becky/src/nsBeckyFilters.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'mailnews/import') diff --git a/mailnews/import/becky/src/nsBeckyFilters.cpp b/mailnews/import/becky/src/nsBeckyFilters.cpp index 517a18014..97b99fec2 100644 --- a/mailnews/import/becky/src/nsBeckyFilters.cpp +++ b/mailnews/import/becky/src/nsBeckyFilters.cpp @@ -770,9 +770,16 @@ nsBeckyFilters::CollectServers() nsCOMPtr defaultAccount; rv = accountManager->GetDefaultAccount(getter_AddRefs(defaultAccount)); NS_ENSURE_SUCCESS(rv, rv); + if (defaultAccount) + return defaultAccount->GetIncomingServer(getter_AddRefs(mServer)); - nsCOMPtr 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 -- cgit v1.2.3