From 964dc14a8a6beb6a17ef3767a0748193d78566e4 Mon Sep 17 00:00:00 2001
From: Karl Tauber <karl@jformdesigner.com>
Date: Mon, 21 Oct 2019 17:04:23 +0200
Subject: [PATCH] ComboBox: fixed NPE in combobox with custom renderer after
 switching to FlatLaf (#16; regression in 0.14)

---
 CHANGELOG.md                                                | 6 ++++++
 .../main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java    | 5 ++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 181f1b56..19113ed2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 FlatLaf Change Log
 ==================
 
+## Unreleased
+
+- ComboBox: Fixed NPE in combobox with custom renderer after switching to
+  FlatLaf. (issue #16; regression in 0.14)
+
+
 ## 0.14
 
 - ComboBox: Use small border if used as table editor.
diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java
index 6fd278b5..564ba8e5 100644
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java
@@ -370,7 +370,6 @@ public class FlatComboBoxUI
 		extends BasicComboPopup
 	{
 		private CellPaddingBorder paddingBorder;
-		private final ListCellRenderer renderer = new PopupListCellRenderer();
 
 		FlatComboPopup( JComboBox combo ) {
 			super( combo );
@@ -405,7 +404,7 @@ public class FlatComboBoxUI
 		protected void configureList() {
 			super.configureList();
 
-			list.setCellRenderer( renderer );
+			list.setCellRenderer( new PopupListCellRenderer() );
 		}
 
 		@Override
@@ -416,7 +415,7 @@ public class FlatComboBoxUI
 					super.propertyChange( e );
 
 					if( e.getPropertyName() == "renderer" )
-						list.setCellRenderer( renderer );
+						list.setCellRenderer( new PopupListCellRenderer() );
 				}
 			};
 		}