lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete version folder when installing canceled

Browse Source
This commit is contained in:
huangyuhui
2018-02-02 15:38:55 +08:00
parent ad175fd2f2
commit e4bd1c758f
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TaskExecutorDialogWizardDisplayer.java
View File

@@ -68,6 +68,8 @@ public interface TaskExecutorDialogWizardDisplayer extends AbstractWizardDisplay
@Override @Override
public void onTerminate() { public void onTerminate() {
if (e.getLastException() == null)
return;
String appendix = StringUtils.getStackTrace(e.getLastException()); String appendix = StringUtils.getStackTrace(e.getLastException());
if (settings.containsKey("failure_message") && settings.get("failure_message") instanceof String) if (settings.containsKey("failure_message") && settings.get("failure_message") instanceof String)
JFXUtilities.runInFX(() -> Controllers.dialog(appendix, (String) settings.get("failure_message"), MessageBox.ERROR_MESSAGE, () -> Controllers.navigate(null))); JFXUtilities.runInFX(() -> Controllers.dialog(appendix, (String) settings.get("failure_message"), MessageBox.ERROR_MESSAGE, () -> Controllers.navigate(null)));

7
HMCLCore/src/main/java/org/jackhuang/hmcl/download/DefaultGameBuilder.java
View File

@@ -25,6 +25,7 @@ import org.jackhuang.hmcl.util.AutoTypingMap;
import org.jackhuang.hmcl.util.Constants; import org.jackhuang.hmcl.util.Constants;
import org.jackhuang.hmcl.util.ExceptionalFunction; import org.jackhuang.hmcl.util.ExceptionalFunction;
import java.io.IOException;
import java.util.function.Function; import java.util.function.Function;
/** /**
@@ -69,6 +70,12 @@ public class DefaultGameBuilder extends GameBuilder {
if (toolVersions.containsKey("optifine")) if (toolVersions.containsKey("optifine"))
result = result.then(libraryTaskHelper(gameVersion, "optifine")); result = result.then(libraryTaskHelper(gameVersion, "optifine"));
return result; return result;
}).finalized(new Task() {
@Override
public void execute() {
if (!isDependentsSucceeded())
dependencyManager.getGameRepository().getVersionRoot(name).delete();
}
}); });
} }