Changeset 17688 in josm for trunk/src/org/openstreetmap

Timestamp:

2021-03-30T09:03:19+02:00 (4 years ago)

Author:

simon04

Message:

see #19724 - Fix NPE in PlatformHookWindows.getInstalledFonts on Linux/macOS

File:

• trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java

@@ -529 +529 @@
         // Use more low-level method to find the installed fonts.
         List<String> fontsAvail = new ArrayList<>();
-        Path fontPath = FileSystems.getDefault().getPath(getSystemEnv("SYSTEMROOT"), "Fonts");
+        String systemRoot = getSystemEnv("SYSTEMROOT");
+        if (systemRoot == null) {
+            return fontsAvail;
+        }
+        Path fontPath = FileSystems.getDefault().getPath(systemRoot, "Fonts");
         try (DirectoryStream<Path> ds = Files.newDirectoryStream(fontPath)) {
             for (Path p : ds) {