From 532ff88ea41b264cbf072ba3d362cdddf02993c0 Mon Sep 17 00:00:00 2001
From: huangyuhui <huanghongxun2008@126.com>
Date: Sat, 20 May 2017 19:01:32 +0800
Subject: [PATCH] Fixed not aborting launching when not having successfully
 downloaded all libraries

---
 .../org/jackhuang/hmcl/ui/MainPagePanel.java   |   2 +-
 .../jackhuang/hmcl/util/task/ParallelTask.java |   4 +++-
 .../utils/imgs/np/btn_special_disabled.9.png   | Bin 3245 -> 217 bytes
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/MainPagePanel.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/MainPagePanel.java
index c3bd2fe86..8df0fd9c1 100755
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/MainPagePanel.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/MainPagePanel.java
@@ -519,7 +519,7 @@ public class MainPagePanel extends Page {
         isLoading = false;
     }
 
-    final Consumer<LaunchingStateChangedEvent> launchingStateChanged = t -> SwingUtils.setEnabled(MainFrame.INSTANCE.getRootPane(), t.getValue() == LaunchingState.Done);
+    final Consumer<LaunchingStateChangedEvent> launchingStateChanged = t -> SwingUtilities.invokeLater(() -> SwingUtils.setEnabled(MainFrame.INSTANCE.getRootPane(), t.getValue() == LaunchingState.Done));
 
     void versionChanged(String selectedVersion) {
         isLoading = true;
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/ParallelTask.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/ParallelTask.java
index a85a9e333..94ef9c824 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/ParallelTask.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/task/ParallelTask.java
@@ -33,7 +33,9 @@ public class ParallelTask extends Task {
     }
 
     @Override
-    public void executeTask(boolean areDependTasksSucceeded) {
+    public void executeTask(boolean areDependTasksSucceeded) throws Exception {
+        if (!areDependTasksSucceeded)
+            throw new Exception("Tasks failed");
     }
 
     @Override
diff --git a/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/utils/imgs/np/btn_special_disabled.9.png b/HMCLaF/src/main/resources/org/jackhuang/hmcl/laf/utils/imgs/np/btn_special_disabled.9.png
index e72ec14deb58966443d16cae94ba434bff839d96..d94e767b7fd755dffa727f24dbe0b7b2f3d2f28e 100644
GIT binary patch
delta 189
zcmZ20d6RL1N<B-llV=DA5Y%v_bTBY5a29w(7Bet#eE?xbr!^)sfP(TRt`Q}{`DrEP
ziAAXlzKO|2`MIennTZN+nMJAP`9;~q3Km;4E>!@P26(zShIn+oy|SB^L4kuMpg`^0
z{D!&brg`ve{2*K$?pSd&bj1^eGg^-yy_=wvw#;m;lVNq?&F?<ENlB0R4Z}Wo_fMQL
m<A>h0pxpI_s~H$xUSqt%&7H3@TWK=Ta0X9TKbLh*2~7ax3`P|I

delta 3241
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
bbzcJjdThZ0jYDLG00000NkvXXu0mjfH&Hr*