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

Merge pull request #6450 from obrakmann/fix6444

Browse Source 
Prevent a NullReferenceException in GameInfoStatsLogic
This commit is contained in:
Matthias Mailänder
2014-09-13 18:52:56 +02:00
parent 636e1b5102 6a9a70d7b9
commit 054cdf13c0
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.RA/Widgets/Logic/Ingame/GameInfoStatsLogic.cs
View File

@@ -48,7 +48,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
var nameLabel = item.Get<LabelWidget>("NAME"); var nameLabel = item.Get<LabelWidget>("NAME");
nameLabel.GetText = () => nameLabel.GetText = () =>
{ {
if (client.State == Network.Session.ClientState.Disconnected) if (client != null && client.State == Network.Session.ClientState.Disconnected)
return pp.PlayerName + " (Gone)"; return pp.PlayerName + " (Gone)";
return pp.PlayerName + (pp.WinState == WinState.Undefined ? "" : " (" + pp.WinState + ")"); return pp.PlayerName + (pp.WinState == WinState.Undefined ? "" : " (" + pp.WinState + ")");
}; };

2
OpenRA.Mods.RA/Widgets/Logic/LobbyUtils.cs
View File

@@ -457,7 +457,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
var client = player.World.LobbyInfo.ClientWithIndex(player.ClientIndex); var client = player.World.LobbyInfo.ClientWithIndex(player.ClientIndex);
playerName.GetText = () => playerName.GetText = () =>
{ {
if (client.State == Network.Session.ClientState.Disconnected) if (client != null && client.State == Network.Session.ClientState.Disconnected)
return player.PlayerName + " (Gone)"; return player.PlayerName + " (Gone)";
return player.PlayerName + (player.WinState == WinState.Undefined ? "" : " (" + player.WinState + ")"); return player.PlayerName + (player.WinState == WinState.Undefined ? "" : " (" + player.WinState + ")");
}; };