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

Prevent crash when invalid or not yet created LAN games are discovered.

Browse Source
This commit is contained in:
RoosterDragon
2018-03-17 13:05:47 +00:00
committed by reaperrr
parent f47595b780
commit adc4538c44
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
OpenRA.Mods.Common/Widgets/Logic/ServerListLogic.cs
View File

@@ -339,24 +339,30 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var lanGames = new List<GameServer>(); var lanGames = new List<GameServer>();
foreach (var bl in lanGameLocations) foreach (var bl in lanGameLocations)
{ {
var game = MiniYaml.FromString(bl.Data)[0].Value; try
var idNode = game.Nodes.FirstOrDefault(n => n.Key == "Id");
// Skip beacons created by this instance and replace Id by expected int value
if (idNode != null && idNode.Value.Value != Platform.SessionGUID.ToString())
{ {
idNode.Value.Value = "-1"; if (string.IsNullOrEmpty(bl.Data))
continue;
// Rewrite the server address with the correct IP var game = MiniYaml.FromString(bl.Data)[0].Value;
var addressNode = game.Nodes.FirstOrDefault(n => n.Key == "Address"); var idNode = game.Nodes.FirstOrDefault(n => n.Key == "Id");
if (addressNode != null)
addressNode.Value.Value = bl.Address.ToString().Split(':')[0] + ":" + addressNode.Value.Value.Split(':')[1];
try // Skip beacons created by this instance and replace Id by expected int value
if (idNode != null && idNode.Value.Value != Platform.SessionGUID.ToString())
{ {
idNode.Value.Value = "-1";
// Rewrite the server address with the correct IP
var addressNode = game.Nodes.FirstOrDefault(n => n.Key == "Address");
if (addressNode != null)
addressNode.Value.Value = bl.Address.ToString().Split(':')[0] + ":" + addressNode.Value.Value.Split(':')[1];
lanGames.Add(new GameServer(game)); lanGames.Add(new GameServer(game));
} }
catch { } }
catch
{
// Ignore any invalid LAN games advertised.
} }
} }