From d30fe66cacef3b4543c8941e07c4857a5c525dbb Mon Sep 17 00:00:00 2001 From: Sung Ho Yoon <55358516+syoon2@users.noreply.github.com> Date: Sun, 6 Aug 2023 09:35:00 +0900 Subject: [PATCH] Narrow version range for not using system icons --- .../main/java/com/formdev/flatlaf/ui/FlatFileChooserUI.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatFileChooserUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatFileChooserUI.java index 96fd8c2cc..0d501e57e 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatFileChooserUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatFileChooserUI.java @@ -348,10 +348,10 @@ public void clearIconCache() { private boolean doNotUseSystemIcons() { // Java 17 32bit craches on Windows when using system icons - // fixed in Java 18+ (see https://bugs.openjdk.java.net/browse/JDK-8277299) + // fixed in Java 18+, fix backported in Java 17.0.3+ (see https://bugs.openjdk.java.net/browse/JDK-8277299) return SystemInfo.isWindows && SystemInfo.isX86 && - (SystemInfo.isJava_17_orLater && !SystemInfo.isJava_18_orLater); + (SystemInfo.isJava_17_orLater && SystemInfo.javaVersion < SystemInfo.toVersion(17, 0, 3, 0)); } //---- class FlatFileView -------------------------------------------------