Fix default printer searching on 2.1.6 (qzind#945)

Fixes the default printer missing on MacOS Closes qzind#944
jare25 · Mar 24, 2022 · 914f6c0 · 914f6c0
1 parent 988a07d
commit 914f6c0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/qz/printer/PrintServiceMatcher.java b/src/qz/printer/PrintServiceMatcher.java
@@ -55,7 +55,7 @@ public static NativePrinter getDefaultPrinter() {
             printers.putAll(defaultService);
         }
 
-        return printers.get(defaultService.getName());
+        return printers.get(defaultService);
     }
 
     public static String findPrinterName(String query) throws JSONException {

diff --git a/src/qz/printer/info/NativePrinterMap.java b/src/qz/printer/info/NativePrinterMap.java
@@ -5,6 +5,7 @@
 import qz.utils.SystemUtilities;
 
 import javax.print.PrintService;
+import java.lang.annotation.Native;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Map;
@@ -68,4 +69,13 @@ public boolean contains(PrintService service) {
         }
         return false;
     }
+
+    public NativePrinter get(PrintService service) {
+        for (NativePrinter printer : values()) {
+            if (printer.getPrintService().equals(service)) {
+                return printer;
+            }
+        }
+        return null;
+    }
 }