From fdabca99b26aee089d81654790920a2e004950ba Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Fri, 7 Aug 2020 23:10:22 +0200 Subject: [PATCH] ScrollBar: fixed NPE when switching LaF while smooth scrolling animation is running (issue #50) --- .../src/main/java/com/formdev/flatlaf/ui/FlatScrollBarUI.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatScrollBarUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatScrollBarUI.java index 732e0fa3..676abfe1 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatScrollBarUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatScrollBarUI.java @@ -510,7 +510,7 @@ public class FlatScrollBarUI Object interpolator = UIManager.get( "ScrollPane.smoothScrolling.interpolator" ); animator = new Animator( duration, fraction -> { - if( !scrollbar.isShowing() ) { + if( scrollbar == null || !scrollbar.isShowing() ) { animator.cancel(); return; }