Fix NPE when there's no default printer

tresf · tresf · commit 67b6448f7f9d · 2022-03-24T17:48:27.000-04:00
diff --git a/src/qz/printer/PrintServiceMatcher.java b/src/qz/printer/PrintServiceMatcher.java
@@ -81,7 +81,7 @@ public static NativePrinter matchPrinter(String printerSearch, boolean silent) {
         if (!silent) { log.debug("Searching for PrintService matching {}", printerSearch); }
 
         NativePrinter defaultPrinter = getDefaultPrinter();
-        if (printerSearch.equals(defaultPrinter.getName())) {
+        if (defaultPrinter != null && printerSearch.equals(defaultPrinter.getName())) {
             if (!silent) { log.debug("Matched default printer, skipping further search"); }
             return defaultPrinter;
         }

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public static NativePrinter matchPrinter(String printerSearch, boolean silent) {`
`81`	`81`	`if (!silent) { log.debug("Searching for PrintService matching {}", printerSearch); }`
`82`	`82`
`83`	`83`	`NativePrinter defaultPrinter = getDefaultPrinter();`
`84`		`- if (printerSearch.equals(defaultPrinter.getName())) {`
	`84`	`+ if (defaultPrinter != null && printerSearch.equals(defaultPrinter.getName())) {`
`85`	`85`	`if (!silent) { log.debug("Matched default printer, skipping further search"); }`
`86`	`86`	`return defaultPrinter;`
`87`	`87`	`}`