Skip to content

fix: 更新时不保存窗口位置 #5819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CiiLu wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix: 更新时不保存窗口位置 #5819

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b2bbea
update
CiiLu Mar 21, 2026
f56b633
update
CiiLu Mar 21, 2026
12b272c
update
CiiLu Mar 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 25 additions & 3 deletions HMCL/src/main/java/org/jackhuang/hmcl/upgrade/UpdateHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,20 @@
import com.google.gson.Gson;
import com.google.gson.JsonParseException;
import javafx.application.Platform;

import org.jackhuang.hmcl.EntryPoint;
import org.jackhuang.hmcl.Main;
import org.jackhuang.hmcl.Metadata;
import org.jackhuang.hmcl.java.JavaRuntime;
import org.jackhuang.hmcl.task.Task;
import org.jackhuang.hmcl.task.TaskExecutor;
import org.jackhuang.hmcl.ui.Controllers;
import org.jackhuang.hmcl.ui.UpgradeDialog;
import org.jackhuang.hmcl.ui.construct.MessageDialogPane.MessageType;
import org.jackhuang.hmcl.util.FileSaver;
import org.jackhuang.hmcl.util.StringUtils;
import org.jackhuang.hmcl.util.SwingUtils;
import org.jackhuang.hmcl.util.TaskCancellationAction;
import org.jackhuang.hmcl.util.io.JarUtils;
import org.jackhuang.hmcl.java.JavaRuntime;
import org.jackhuang.hmcl.util.platform.OperatingSystem;

import java.io.IOException;
Expand All @@ -43,13 +43,15 @@
import java.nio.file.Paths;
import java.util.*;
import java.util.concurrent.CancellationException;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import static org.jackhuang.hmcl.ui.FXUtils.checkFxUserThread;
import static org.jackhuang.hmcl.util.Lang.thread;
import static org.jackhuang.hmcl.util.logging.Logger.LOG;
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
import static org.jackhuang.hmcl.util.logging.Logger.LOG;

public final class UpdateHandler {
private UpdateHandler() {
Expand Down Expand Up @@ -125,6 +127,26 @@ public static void updateFrom(RemoteVersion version) {
throw new IOException("Current JAR is not verified");
}

CompletableFuture<Void> future = new CompletableFuture<>();

Platform.runLater(() -> {
Controllers.onApplicationStop();
future.complete(null);
});

try {
future.get();
} catch (ExecutionException | InterruptedException ignored) {
// Ignore
}


try {
FileSaver.waitForAllSaves();
} catch (InterruptedException ignored) {
// Ignore
}

requestUpdate(downloaded, getCurrentLocation());
EntryPoint.exit(0);
} catch (IOException e) {
Expand Down