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

Fix crash when master server query returns unexpected data.

Browse Source
This commit is contained in:
Paul Chote
2017-03-10 18:21:34 +00:00
parent 5e737980fe
commit 00b1bc7cd2
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
OpenRA.Mods.Common/Widgets/Logic/MultiplayerLogic.cs
View File

@@ -10,6 +10,7 @@
#endregion
using System;
using System.Collections;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
@@ -56,7 +57,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{
switch (searchStatus)
{
case SearchStatus.Failed: return "Failed to contact master server.";
case SearchStatus.Failed: return "Failed to query server list.";
case SearchStatus.NoGames: return "No games found. Try changing filters.";
default: return "";
}
@@ -300,18 +301,24 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{
currentQuery = null;
if (i.Error != null)
List<GameServer> games = null;
if (i.Error == null)
{
RefreshServerListInner(null);
return;
try
{
var data = Encoding.UTF8.GetString(i.Result);
var yaml = MiniYaml.FromString(data);
games = yaml.Select(a => new GameServer(a.Value))
.Where(gs => gs.Address != null)
.ToList();
}
catch
{
searchStatus = SearchStatus.Failed;
}
}
var data = Encoding.UTF8.GetString(i.Result);
var yaml = MiniYaml.FromString(data);
var games = yaml.Select(a => new GameServer(a.Value))
.Where(gs => gs.Address != null);
Game.RunAfterTick(() => RefreshServerListInner(games));
};
@@ -343,7 +350,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
currentMap = server != null ? modData.MapCache[server.Map] : null;
}
void RefreshServerListInner(IEnumerable<GameServer> games)
void RefreshServerListInner(List<GameServer> games)
{
if (games == null)
return;