From 22cd3c95e453180bb5a968e6c739107aefa9ebad Mon Sep 17 00:00:00 2001
From: zack <zack@finereport.com>
Date: Tue, 4 Dec 2018 09:01:04 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-13215=2010.0=E8=AE=BE=E8=AE=A1=E5=99=A8?=
 =?UTF-8?q?=E5=90=AF=E5=8A=A8=E8=BF=87=E7=A8=8B=E4=B8=AD=E5=8F=AF=E8=83=BD?=
 =?UTF-8?q?=E7=94=B1=E4=BA=8E=E6=8A=A5=E9=94=99=E5=AF=BC=E8=87=B4=E7=99=BD?=
 =?UTF-8?q?=E8=89=B2=E8=92=99=E5=B1=82=E4=B8=8D=E6=B6=88=E5=A4=B1.?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5master?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/fr/start/ServerStarter.java         | 6 +++++-
 .../main/java/com/fr/start/module/DesignerStartup.java    | 8 +++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/start/ServerStarter.java b/designer-base/src/main/java/com/fr/start/ServerStarter.java
index 3115730d17..7499b1ae39 100644
--- a/designer-base/src/main/java/com/fr/start/ServerStarter.java
+++ b/designer-base/src/main/java/com/fr/start/ServerStarter.java
@@ -66,7 +66,11 @@ public class ServerStarter {
 
                 @Override
                 public void run() {
-                    FineEmbedServer.start();
+                    try {
+                        FineEmbedServer.start();
+                    } finally {
+                        FineEmbedServerMonitor.getInstance().setComplete();
+                    }
                     BrowseUtils.browser(url);
                 }
             });
diff --git a/designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java b/designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java
index 71f197ea6e..701a6936c1 100644
--- a/designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java
+++ b/designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java
@@ -52,9 +52,11 @@ public class DesignerStartup extends Activator {
         
             @Override
             public void run() {
-            
-                designer.show(args);
-                DesignerContext.getDesignerFrame().getProgressDialog().dispose();
+                try {
+                    designer.show(args);
+                } finally {
+                    DesignerContext.getDesignerFrame().getProgressDialog().dispose();
+                }
             }
         });
         service.shutdown();