From b92d50fe195e10833d63d098764930f2b14f3aa2 Mon Sep 17 00:00:00 2001
From: neil <459208047@qq.com>
Date: Mon, 11 Jun 2018 14:22:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=EF=BC=8Cnpe?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/gui/imenu/UIBasicMenuItemUI.java     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/designer-base/src/com/fr/design/gui/imenu/UIBasicMenuItemUI.java b/designer-base/src/com/fr/design/gui/imenu/UIBasicMenuItemUI.java
index 8dcb2d806..74c65e8ee 100644
--- a/designer-base/src/com/fr/design/gui/imenu/UIBasicMenuItemUI.java
+++ b/designer-base/src/com/fr/design/gui/imenu/UIBasicMenuItemUI.java
@@ -629,7 +629,7 @@ public class UIBasicMenuItemUI extends MenuItemUI {
         LookAndFeel.installBorder(menuItem, prefix + ".border");
         oldBorderPainted = menuItem.isBorderPainted();
         menuItem.setBorderPainted(((Boolean) (UIManager.get(prefix + ".borderPainted"))).booleanValue());
-        installFont(prefix);
+        installFont(prefix, menuItem);
 
         // MenuItem specific defaults
         if (selectionBackground == null || selectionBackground instanceof UIResource) {
@@ -666,10 +666,13 @@ public class UIBasicMenuItemUI extends MenuItemUI {
         defaultIconGap = DEFAULT_ICON_GAP; // Should be from table
     }
 
-    private void installFont(final String prefix) {
+    private void installFont(final String prefix, final JComponent menuItem) {
         Thread thread = new Thread(new Runnable() {
             @Override
             public void run() {
+                if (menuItem == null) {
+                    return;
+                }
                 LookAndFeel.installColorsAndFont(menuItem, prefix + ".background", prefix + ".foreground", prefix + ".font");
             }
         });