epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed #1237 - crash in UpdateCurrentMap

Browse Source
This commit is contained in:
Chris Forbes
2011-11-04 19:16:53 +13:00
parent 5a029e337a
commit 57e2d4f9b1
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
View File

@@ -153,12 +153,16 @@ namespace OpenRA.Mods.RA.Widgets.Logic
void UpdateCurrentMap() void UpdateCurrentMap()
{ {
if (MapUid == orderManager.LobbyInfo.GlobalSettings.Map) return; var newMap = orderManager.LobbyInfo.GlobalSettings.Map;
MapUid = orderManager.LobbyInfo.GlobalSettings.Map; if (MapUid == newMap) return;
MapUid = newMap;
Map = new Map(Game.modData.AvailableMaps[MapUid].Path); Map = new Map(Game.modData.AvailableMaps[MapUid].Path);
var title = Widget.RootWidget.GetWidget<LabelWidget>("LOBBY_TITLE"); var title = Widget.RootWidget.GetWidget<LabelWidget>("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() void UpdatePlayerList()