From df049f2b092de9cd740391fd337fb2179422a6a8 Mon Sep 17 00:00:00 2001
From: plough <plough@fanruan.com>
Date: Tue, 11 Dec 2018 17:03:12 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-13363=20=E6=95=B0=E6=8D=AE=E8=BF=81?=
 =?UTF-8?q?=E7=A7=BB=E5=90=8E=EF=BC=8C=E8=AE=BE=E8=AE=A1=E5=99=A8=E5=90=AF?=
 =?UTF-8?q?=E5=8A=A8=E9=97=AA=E9=80=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/fr/start/Designer.java           | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/designer-realize/src/main/java/com/fr/start/Designer.java b/designer-realize/src/main/java/com/fr/start/Designer.java
index 5b10dc9c1..e80a31603 100644
--- a/designer-realize/src/main/java/com/fr/start/Designer.java
+++ b/designer-realize/src/main/java/com/fr/start/Designer.java
@@ -57,6 +57,7 @@ import com.fr.start.server.ServerTray;
 import com.fr.workspace.WorkContext;
 
 import javax.swing.JComponent;
+import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.border.MatteBorder;
 import java.awt.Component;
@@ -92,14 +93,16 @@ public class Designer extends BaseDesigner {
      * @param args 参数
      */
     public static void main(String[] args) {
-    
+
         //启动运行时
         FineRuntime.start();
         BuildContext.setBuildFilePath("/com/fr/stable/build.properties");
         // 如果端口被占用了 说明程序已经运行了一次,也就是说，已经建立一个监听服务器，现在只要给服务器发送命令就好了
         if (DesignUtils.isStarted()) {
             DesignUtils.clientSend(args);
-            FineLoggerFactory.getLogger().error("Designer port not available.");
+            String message = "Designer port not available.";
+            JOptionPane.showMessageDialog(null, message, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error"), JOptionPane.ERROR_MESSAGE);
+            FineLoggerFactory.getLogger().error(message);
             System.exit(0);
             return;
         }
@@ -115,7 +118,10 @@ public class Designer extends BaseDesigner {
         try {
             designerRoot.start();
         } catch (LifecycleFatalError fatal) {
+            SplashContext.getInstance().hide();
+            JOptionPane.showMessageDialog(null, fatal.getMessage(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error"), JOptionPane.ERROR_MESSAGE);
             FineLoggerFactory.getLogger().error(fatal.getMessage(), fatal);
+            System.exit(0);
         }
 
         if (WorkContext.getCurrent().isLocal()) {