From 6f52c515df58550796fd37458def6cfa6d160e81 Mon Sep 17 00:00:00 2001
From: obydog002 <38587157+obydog002@users.noreply.github.com>
Date: Sat, 1 Jun 2024 05:27:05 +0800
Subject: [PATCH] Fix create game map and mod selection (#3188)

#3156 map selection and active mods are now remembered correctly
---
 .../java/com/faforever/client/game/CreateGameController.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/com/faforever/client/game/CreateGameController.java b/src/main/java/com/faforever/client/game/CreateGameController.java
index db0f65da41..79d877054e 100644
--- a/src/main/java/com/faforever/client/game/CreateGameController.java
+++ b/src/main/java/com/faforever/client/game/CreateGameController.java
@@ -210,6 +210,10 @@ public void onCloseButtonClicked() {
     onCloseButtonClickedListener.run();
   }
 
+  @Override
+  public void onShow() {
+    addShownSubscription(() -> modManagerController.apply());
+  }
 
   private void setCreateGameButtonState() {
     String title = titleTextField.getText();
@@ -309,6 +313,7 @@ protected void initMapSelection() {
       if (newItem == null && filteredMaps.contains(oldItem)) {
         mapListView.getSelectionModel().select(oldItem);
       } else {
+        lastGamePrefs.setLastMap(newItem != null ? newItem.folderName() : null);
         selectedMap.set(newItem);
       }
     });