Skip to content

Commit e8ff42c

Browse files
authored
修复取消导出整合包时弹出报错对话框的问题 (#3752)
* 修复取消导出整合包时弹出报错对话框的问题 * Update
1 parent 44ca2cd commit e8ff42c

1 file changed

Lines changed: 7 additions & 0 deletions

File tree

HMCL/src/main/java/org/jackhuang/hmcl/ui/wizard/TaskExecutorDialogWizardDisplayer.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
import java.util.Map;
3232
import java.util.Queue;
33+
import java.util.concurrent.CancellationException;
3334

3435
import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
3536
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
@@ -69,6 +70,12 @@ else if (!settings.containsKey("forbid_success_message"))
6970
} else {
7071
if (executor.getException() == null)
7172
return;
73+
74+
if (executor.getException() instanceof CancellationException) {
75+
onEnd();
76+
return;
77+
}
78+
7279
String appendix = StringUtils.getStackTrace(executor.getException());
7380
if (settings.get("failure_callback") instanceof WizardProvider.FailureCallback)
7481
((WizardProvider.FailureCallback) settings.get("failure_callback")).onFail(settings, executor.getException(), () -> onEnd());

0 commit comments

Comments
 (0)