From b491202ec75834c29bce43a6941d59a1daebdb17 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Wed, 15 Jul 2020 11:57:40 +0200 Subject: [PATCH] UIDefaultsLoader: fixed NPE on syntax error in color function --- .../src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java index 7d2340ba..3a6109ca 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java @@ -639,6 +639,8 @@ class UIDefaultsLoader // parse base color String resolvedColorStr = resolver.apply( colorStr ); ColorUIResource baseColor = (ColorUIResource) parseColorOrFunction( resolvedColorStr, resolver, reportError ); + if( baseColor == null ) + return null; // apply this function to base color Color newColor = ColorFunctions.applyFunctions( baseColor, function );