From 44f8a8185416ac7c5f6239991c1679fde36bd28a Mon Sep 17 00:00:00 2001
From: weisj <weisj@arcor.de>
Date: Sun, 8 Mar 2020 19:13:53 +0100
Subject: [PATCH] Fixed ComboBox border NPE

---
 .../com/github/weisj/darklaf/ui/combobox/DarkComboBoxUI.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/com/github/weisj/darklaf/ui/combobox/DarkComboBoxUI.java b/core/src/main/java/com/github/weisj/darklaf/ui/combobox/DarkComboBoxUI.java
index ca467545..5616f1e6 100644
--- a/core/src/main/java/com/github/weisj/darklaf/ui/combobox/DarkComboBoxUI.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/combobox/DarkComboBoxUI.java
@@ -74,7 +74,6 @@ public class DarkComboBoxUI extends BasicComboBoxUI implements Border, PropertyC
     @Override
     public void installUI(final JComponent c) {
         super.installUI(c);
-        comboBox.setBorder(this);
         boxPadding = UIManager.getInsets("ComboBox.insets");
         borderSize = UIManager.getInt("ComboBox.borderThickness");
         background = UIManager.getColor("ComboBox.activeBackground");
@@ -89,6 +88,7 @@ public class DarkComboBoxUI extends BasicComboBoxUI implements Border, PropertyC
         cellPadding = UIManager.getInsets("ComboBox.cellEditorInsets");
         if (boxPadding == null) boxPadding = new Insets(0, 0, 0, 0);
         if (cellPadding == null) cellPadding = new Insets(0, 0, 0, 0);
+        comboBox.setBorder(this);
     }
 
     @Override