From 5f997c8d2b0c1903803b6b7c42cdef395ba1c820 Mon Sep 17 00:00:00 2001
From: Tom Schuster <evilpies@gmail.com>
Date: Thu, 4 Mar 2021 16:03:30 +0000
Subject: [PATCH] Bug 1694844 - In nsPrinterListCUPS::SystemDefaultPrinterName
 return NS_OK even without working CUPS. r=emilio

The other nsPrinterListCUPS methods already handle !InitOkay() without returning an error or rejecting
the promise.

Differential Revision: https://phabricator.services.mozilla.com/D107210
---
 toolkit/components/printing/content/print.js | 2 +-
 widget/nsPrinterListCUPS.cpp                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolkit/components/printing/content/print.js b/toolkit/components/printing/content/print.js
index 052db8db2c57..bfa38981cc29 100644
--- a/toolkit/components/printing/content/print.js
+++ b/toolkit/components/printing/content/print.js
@@ -875,7 +875,7 @@ var PrintEventHandler = {
     let printers;
 
     if (Cu.isInAutomation) {
-      printers = await Promise.resolve(window._mockPrinters || []);
+      printers = window._mockPrinters || [];
     } else {
       try {
         printers = await printerList.printers;
diff --git a/widget/nsPrinterListCUPS.cpp b/widget/nsPrinterListCUPS.cpp
index 960fb32c4184..b1d695752652 100644
--- a/widget/nsPrinterListCUPS.cpp
+++ b/widget/nsPrinterListCUPS.cpp
@@ -180,7 +180,7 @@ nsresult nsPrinterListCUPS::SystemDefaultPrinterName(nsAString& aName) const {
   aName.Truncate();
 
   if (!CupsShim().InitOkay()) {
-    return NS_ERROR_FAILURE;
+    return NS_OK;
   }
 
   // Passing in nullptr for the name will return the default, if any.