From 2dd75c4a640ee85b5d82c9ce172b952a537f7b2e Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Fri, 12 Aug 2022 15:41:55 +0200 Subject: [PATCH] fixed possible exception in FlatUIUtils.resetRenderingHints() (issue #575) --- CHANGELOG.md | 1 + .../src/main/java/com/formdev/flatlaf/ui/FlatUIUtils.java | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 47da870e..9d6bca82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ FlatLaf Change Log - Fixed missing UI value `MenuItem.acceleratorDelimiter` on macOS. (was `null`, is now an empty string) +- Fixed possible exception in `FlatUIUtils.resetRenderingHints()`. (issue #575) ## 2.4 diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatUIUtils.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatUIUtils.java index fd3ddea2..53440bcc 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatUIUtils.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatUIUtils.java @@ -352,8 +352,10 @@ public class FlatUIUtils */ public static void resetRenderingHints( Graphics g, Object[] oldRenderingHints ) { Graphics2D g2 = (Graphics2D) g; - g2.setRenderingHint( RenderingHints.KEY_ANTIALIASING, oldRenderingHints[0] ); - g2.setRenderingHint( RenderingHints.KEY_STROKE_CONTROL, oldRenderingHints[1] ); + if( oldRenderingHints[0] != null ) + g2.setRenderingHint( RenderingHints.KEY_ANTIALIASING, oldRenderingHints[0] ); + if( oldRenderingHints[1] != null ) + g2.setRenderingHint( RenderingHints.KEY_STROKE_CONTROL, oldRenderingHints[1] ); } /**