fixed NPE in FlatUIUtils.isCellEditor() (issue #601)

JFormDesigner · Oct 17, 2022 · 36c405c · 36c405c
1 parent bc7c68e
commit 36c405c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,7 @@ FlatLaf Change Log
   feedback only for left mouse button.
 - ScaledImageIcon: Do not throw exceptions if image was has invalid size (e.g.
   not found). Instead, paint a red rectangle (similar to `FlatSVGIcon`).
+- Fixed NPE in `FlatUIUtils.isCellEditor()`. (issue #601)
 
 
 ## 2.5

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
@@ -210,6 +210,9 @@ public static int minimumHeight( JComponent c, int minimumHeight ) {
 	}
 
 	public static boolean isCellEditor( Component c ) {
+		if( c == null )
+			return false;
+
 		// check whether used in cell editor (check 3 levels up)
 		Component c2 = c;
 		for( int i = 0; i <= 2 && c2 != null; i++ ) {