AstralTransRocketries/HMCL
1
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-09-16 15:26:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: removing modpack with incomplete installation

Browse Source
This commit is contained in:
huanghongxun 2020-02-19 22:50:48 +08:00
parent 3269841207
commit cd9180c69a
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HMCLCore/src/main/java/org/jackhuang/hmcl/download/VersionList.java
View File

@ -86,7 +86,7 @@ public abstract class VersionList<T extends RemoteVersion> {
} }
public Task<?> loadAsync(String gameVersion) { public Task<?> loadAsync(String gameVersion) {
return Task.composeAsync(() -> { return Task.composeAsync(null, () -> {
lock.readLock().lock(); lock.readLock().lock();
boolean loaded; boolean loaded;

4
HMCLCore/src/main/java/org/jackhuang/hmcl/task/CancellableTaskExecutor.java
View File

@ -143,7 +143,7 @@ public class CancellableTaskExecutor extends TaskExecutor {
.findAny().orElse(null); .findAny().orElse(null);
if (!doDependentsSucceeded && task.isRelyingOnDependents() || cancelled.get()) { if (!doDependentsSucceeded && task.isRelyingOnDependents() || cancelled.get()) {
task.setException(dependentsException); task.setException(dependentsException);
throw new CancellationException(); throw new ExecutionException(dependentsException);
} }
if (doDependentsSucceeded) if (doDependentsSucceeded)
@ -183,7 +183,7 @@ public class CancellableTaskExecutor extends TaskExecutor {
if (!doDependenciesSucceeded && task.isRelyingOnDependencies()) { if (!doDependenciesSucceeded && task.isRelyingOnDependencies()) {
Logging.LOG.severe("Subtasks failed for " + task.getName()); Logging.LOG.severe("Subtasks failed for " + task.getName());
task.setException(dependenciesException); task.setException(dependenciesException);
throw new CancellationException(); throw new ExecutionException(dependenciesException);
} }
flag = true; flag = true;

2
HMCLCore/src/main/java/org/jackhuang/hmcl/task/FileDownloadTask.java
View File

@ -211,7 +211,7 @@ public class FileDownloadTask extends Task<Void> {
Exception exception = null; Exception exception = null;
for (int repeat = 0; repeat < retry * urls.size(); repeat++) { for (int repeat = 0; repeat < retry * urls.size(); repeat++) {
URL url = urls.get(repeat / urls.size()); URL url = urls.get(repeat / retry);
if (isCancelled()) { if (isCancelled()) {
break; break;
} }