From cf232827fbbe306d0e1e3aef66bf152c2611b005 Mon Sep 17 00:00:00 2001
From: kerry <kerry@finereport.com>
Date: Mon, 4 Sep 2017 16:32:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/widget/ui/designer/FreeButtonDefinePane.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer_form/src/com/fr/design/widget/ui/designer/FreeButtonDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/FreeButtonDefinePane.java
index 6dd4e4f2c..db6635453 100644
--- a/designer_form/src/com/fr/design/widget/ui/designer/FreeButtonDefinePane.java
+++ b/designer_form/src/com/fr/design/widget/ui/designer/FreeButtonDefinePane.java
@@ -45,7 +45,7 @@ public class FreeButtonDefinePane extends ButtonDefinePane<FreeButton> {
     public FreeButton updateSubButtonPane() {
         FreeButton freeButton = (FreeButton) creator.toData();
         backgroundCompPane.update(freeButton);
-        FRFont frFont = freeButton.getFont();
+        FRFont frFont = freeButton.getFont() == null ? FRFont.getInstance() : freeButton.getFont();
         freeButton.setFont(frFontPane.update(frFont));
         return freeButton;
     }