From e8ff42c4b29d0b0a5a417c9d470390311c6d9a72 Mon Sep 17 00:00:00 2001 From: Glavo Date: Fri, 21 Mar 2025 11:01:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=96=E6=B6=88=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=95=B4=E5=90=88=E5=8C=85=E6=97=B6=E5=BC=B9=E5=87=BA?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E5=AF=B9=E8=AF=9D=E6=A1=86=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20(#3752)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 修复取消导出整合包时弹出报错对话框的问题 * Update --- .../hmcl/ui/wizard/TaskExecutorDialogWizardDisplayer.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/wizard/TaskExecutorDialogWizardDisplayer.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/wizard/TaskExecutorDialogWizardDisplayer.java index 4b0c364b7..6bfbb5418 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/wizard/TaskExecutorDialogWizardDisplayer.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/wizard/TaskExecutorDialogWizardDisplayer.java @@ -30,6 +30,7 @@ import org.jackhuang.hmcl.util.TaskCancellationAction; import java.util.Map; import java.util.Queue; +import java.util.concurrent.CancellationException; import static org.jackhuang.hmcl.ui.FXUtils.runInFX; import static org.jackhuang.hmcl.util.i18n.I18n.i18n; @@ -69,6 +70,12 @@ public abstract class TaskExecutorDialogWizardDisplayer extends AbstractWizardDi } else { if (executor.getException() == null) return; + + if (executor.getException() instanceof CancellationException) { + onEnd(); + return; + } + String appendix = StringUtils.getStackTrace(executor.getException()); if (settings.get("failure_callback") instanceof WizardProvider.FailureCallback) ((WizardProvider.FailureCallback) settings.get("failure_callback")).onFail(settings, executor.getException(), () -> onEnd());