From 57e2d4f9b11e1ee4619505dfdc02c00320367028 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Fri, 4 Nov 2011 19:16:53 +1300 Subject: [PATCH] fixed #1237 - crash in UpdateCurrentMap --- OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs index 851f5311b6..f0208f930a 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs @@ -153,12 +153,16 @@ namespace OpenRA.Mods.RA.Widgets.Logic void UpdateCurrentMap() { - if (MapUid == orderManager.LobbyInfo.GlobalSettings.Map) return; - MapUid = orderManager.LobbyInfo.GlobalSettings.Map; + var newMap = orderManager.LobbyInfo.GlobalSettings.Map; + if (MapUid == newMap) return; + + MapUid = newMap; Map = new Map(Game.modData.AvailableMaps[MapUid].Path); var title = Widget.RootWidget.GetWidget("LOBBY_TITLE"); - title.Text = "OpenRA Multiplayer Lobby - " + orderManager.LobbyInfo.GlobalSettings.ServerName + " - " + Map.Title; + if (title != null) + title.Text = "OpenRA Multiplayer Lobby - {0} - {1}".F( + orderManager.LobbyInfo.GlobalSettings.ServerName, Map.Title); } void UpdatePlayerList()