Skip to content

Commit aa335d8

Browse files
authored
fix: 世界管理 -> 创建备份 点击后启动器崩溃 (#6023)
1 parent a565d3b commit aa335d8

2 files changed

Lines changed: 7 additions & 4 deletions

File tree

HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
import org.jackhuang.hmcl.util.io.FileUtils;
7171
import org.jackhuang.hmcl.util.platform.Architecture;
7272
import org.jackhuang.hmcl.util.platform.OperatingSystem;
73+
import org.jetbrains.annotations.NotNull;
7374
import org.jetbrains.annotations.Nullable;
7475

7576
import java.io.IOException;
@@ -594,15 +595,15 @@ public static CompletableFuture<List<PromptDialogPane.Builder.Question<?>>> prom
594595
return pane.getCompletableFuture();
595596
}
596597

597-
public static TaskExecutorDialogPane taskDialog(TaskExecutor executor, String title, TaskCancellationAction onCancel) {
598+
public static TaskExecutorDialogPane taskDialog(TaskExecutor executor, String title, @NotNull TaskCancellationAction onCancel) {
598599
TaskExecutorDialogPane pane = new TaskExecutorDialogPane(onCancel);
599600
pane.setTitle(title);
600601
pane.setExecutor(executor);
601602
dialog(pane);
602603
return pane;
603604
}
604605

605-
public static TaskExecutorDialogPane taskDialog(Task<?> task, String title, TaskCancellationAction onCancel) {
606+
public static TaskExecutorDialogPane taskDialog(Task<?> task, String title, @NotNull TaskCancellationAction onCancel) {
606607
TaskExecutor executor = task.executor();
607608
TaskExecutorDialogPane pane = taskDialog(executor, title, onCancel);
608609
executor.start();

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldBackupsPage.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,12 @@
4040
import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
4141
import org.jackhuang.hmcl.util.Pair;
4242
import org.jackhuang.hmcl.util.StringUtils;
43+
import org.jackhuang.hmcl.util.TaskCancellationAction;
4344
import org.jackhuang.hmcl.util.i18n.I18n;
4445
import org.jetbrains.annotations.NotNull;
4546

46-
import java.nio.file.*;
47+
import java.nio.file.Files;
48+
import java.nio.file.Path;
4749
import java.time.LocalDateTime;
4850
import java.time.format.DateTimeFormatter;
4951
import java.util.ArrayList;
@@ -153,7 +155,7 @@ void createBackup() {
153155
LOG.warning("Failed to create backup", exception);
154156
Controllers.dialog(i18n("world.backup.create.failed", StringUtils.getStackTrace(exception)), null, MessageDialogPane.MessageType.WARNING);
155157
}
156-
}), i18n("world.backup"), null);
158+
}), i18n("world.backup"), TaskCancellationAction.NO_CANCEL);
157159
}
158160

159161
private final class WorldBackupsPageSkin extends ToolbarListPageSkin<BackupInfo, WorldBackupsPage> {

0 commit comments

Comments
 (0)