From f8c83b7134d349549615154b652ed42d2908ce91 Mon Sep 17 00:00:00 2001
From: Kot <1192090+koteq@users.noreply.github.com>
Date: Sat, 30 Dec 2023 21:51:36 +0400
Subject: [PATCH] Fix next map not being displayed on the lobby UI after map
 vote (#23231)

Fix map not being displayed in lobby ui after map vote
---
 .../GameTicking/GameTicker.GamePreset.cs          |  2 +-
 Content.Server/GameTicking/GameTicker.Lobby.cs    | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Content.Server/GameTicking/GameTicker.GamePreset.cs b/Content.Server/GameTicking/GameTicker.GamePreset.cs
index f17a3aed37..04f7be016a 100644
--- a/Content.Server/GameTicking/GameTicker.GamePreset.cs
+++ b/Content.Server/GameTicking/GameTicker.GamePreset.cs
@@ -107,8 +107,8 @@ namespace Content.Server.GameTicking
                 return;
 
             Preset = preset;
-            UpdateInfoText();
             ValidateMap();
+            UpdateInfoText();
 
             if (force)
             {
diff --git a/Content.Server/GameTicking/GameTicker.Lobby.cs b/Content.Server/GameTicking/GameTicker.Lobby.cs
index 292e09b6b2..b31472ffa4 100644
--- a/Content.Server/GameTicking/GameTicker.Lobby.cs
+++ b/Content.Server/GameTicking/GameTicker.Lobby.cs
@@ -68,13 +68,22 @@ namespace Content.Server.GameTicking
 
             if (!foundOne)
             {
-                stationNames.Append(Loc.GetString("game-ticker-no-map-selected"));
+                stationNames.Append(_gameMapManager.GetSelectedMap()?.MapName ??
+                                    Loc.GetString("game-ticker-no-map-selected"));
             }
 
             var gmTitle = Loc.GetString(preset.ModeTitle);
             var desc = Loc.GetString(preset.Description);
-            return Loc.GetString(RunLevel == GameRunLevel.PreRoundLobby ? "game-ticker-get-info-preround-text" : "game-ticker-get-info-text",
-                ("roundId", RoundId), ("playerCount", playerCount), ("readyCount", readyCount), ("mapName", stationNames.ToString()),("gmTitle", gmTitle),("desc", desc));
+            return Loc.GetString(
+                RunLevel == GameRunLevel.PreRoundLobby
+                    ? "game-ticker-get-info-preround-text"
+                    : "game-ticker-get-info-text",
+                ("roundId", RoundId),
+                ("playerCount", playerCount),
+                ("readyCount", readyCount),
+                ("mapName", stationNames.ToString()),
+                ("gmTitle", gmTitle),
+                ("desc", desc));
         }
 
         private TickerLobbyStatusEvent GetStatusMsg(ICommonSession session)
-- 
2.51.2