From ec4f9fdbb14424f62a005e23280490c28715e0a9 Mon Sep 17 00:00:00 2001
From: kerry <kerry@finereport.com>
Date: Mon, 4 Sep 2017 16:30:26 +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

---
 .../fr/design/widget/ui/designer/FreeButtonDefinePane.java    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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 1c4ef03a0..6dd4e4f2c 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
@@ -46,9 +46,7 @@ public class FreeButtonDefinePane extends ButtonDefinePane<FreeButton> {
         FreeButton freeButton = (FreeButton) creator.toData();
         backgroundCompPane.update(freeButton);
         FRFont frFont = freeButton.getFont();
-        if(frFont != null){
-            frFontPane.update(frFont);
-        }
+        freeButton.setFont(frFontPane.update(frFont));
         return freeButton;
     }
 }