From 7c25f087fb36d2b1b7062091f8678ecad16f7f49 Mon Sep 17 00:00:00 2001 From: mmatessi <17149962+basix86@users.noreply.github.com> Date: Thu, 27 Feb 2020 16:14:51 +0100 Subject: [PATCH] NPE getDisabledIcon Fix --- flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java index eb72c17b..501d04f1 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java @@ -106,7 +106,7 @@ public abstract class FlatLaf @Override public Icon getDisabledIcon(JComponent component, Icon icon) { - return new IconUIResource(FlatUIUtils.getDisabledIcon(icon)); + return ( icon == null ) ? null : new IconUIResource( FlatUIUtils.getDisabledIcon( icon ) ); } @Override