Add replayKilled variable

FAForever · Mar 25, 2023 · 2e408b4 · 2e408b4
1 parent c188950
commit 2e408b4
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/java/com/faforever/client/game/GameService.java b/src/main/java/com/faforever/client/game/GameService.java
@@ -160,6 +160,7 @@ public class GameService implements InitializingBean {
   private Process replayProcess;
   private CompletableFuture<Void> matchmakerFuture;
   private boolean gameKilled;
+  private boolean replayKilled;
   private boolean rehostRequested;
   private int localReplayPort;
   private boolean inOthersParty;
@@ -588,7 +589,7 @@ public void startSearchMatchmaker() {
         .thenCompose(gameLaunchResponse -> downloadMapIfNecessary(gameLaunchResponse.getMapName()).thenCompose(aVoid -> {
               // We need to kill the replay to free the lock on the game.prefs
               if (isReplayRunning()) {
-                gameKilled = true;
+                replayKilled = true;
                 replayProcess.destroy();
               }
               return leaderboardService.getActiveLeagueEntryForPlayer(playerService.getCurrentPlayer(), gameLaunchResponse.getLeaderboard());
@@ -703,6 +704,7 @@ private CompletableFuture<Void> startGame(GameParameters gameParameters) {
         .thenApply(adapterPort -> {
           fafServerAccessor.setPingIntervalSeconds(5);
           gameKilled = false;
+          replayKilled = false;
           gameParameters.setLocalGpgPort(adapterPort);
           gameParameters.setLocalReplayPort(localReplayPort);
           gameParameters.setRehost(rehostRequested);
@@ -783,7 +785,7 @@ private void handleTermination(Process finishedProcess) {
       }
     });
 
-    if (exitCode != 0 && !gameKilled) {
+    if (exitCode != 0 && !(gameKilled || replayKilled)) {
       if (exitCode == -1073741515) {
         notificationService.addImmediateWarnNotification("game.crash.notInitialized");
       } else {