Browse Source

Merge pull request #245 in DESIGN/design from ~ABEL.CHEN/design:release/10.0 to release/10.0

* commit '57ff79348ff3c633a671a5322ecd4e887743bdfc':
  设计器启动捕获LifecycleFatalError,进程退出
master
abel.chen 6 years ago
parent
commit
ba9c9b2e70
  1. 7
      designer-realize/src/main/java/com/fr/start/Designer.java

7
designer-realize/src/main/java/com/fr/start/Designer.java

@ -47,6 +47,7 @@ import com.fr.stable.OperatingSystem;
import com.fr.stable.ProductConstants;
import com.fr.stable.StableUtils;
import com.fr.stable.StringUtils;
import com.fr.stable.lifecycle.LifecycleFatalError;
import com.fr.stable.xml.XMLTools;
import com.fr.start.fx.SplashFx;
import com.fr.start.jni.SplashMac;
@ -107,7 +108,11 @@ public class Designer extends BaseDesigner {
Module designerRoot = ModuleContext.parseRoot("designer-startup.xml");
//传递启动参数
designerRoot.setSingleton(StartupArgs.class, new StartupArgs(args));
designerRoot.start();
try {
designerRoot.start();
} catch (LifecycleFatalError fatal) {
System.exit(0);
}
if (WorkContext.getCurrent().isLocal()) {
//初始化一下serverTray

Loading…
Cancel
Save