Merge pull request #9491 from cjshmyr/gameinprogress

Fix incorrect "In progress" time shown in server browser
This commit is contained in:
abcdefg30
2015-10-05 16:34:13 +02:00

View File

@@ -363,15 +363,13 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (game.State == (int)ServerState.GameStarted)
{
var label = "";
try
var label = "In progress";
DateTime startTime;
if (DateTime.TryParse(game.Started, out startTime))
{
var runTime = DateTime.Now - System.DateTime.Parse(game.Started);
label = "In progress for {0} minute{1}".F(runTime.Minutes, runTime.Minutes > 1 ? "s" : "");
}
catch (Exception)
{
label = "In progress";
var totalMinutes = Math.Ceiling((DateTime.UtcNow - startTime).TotalMinutes);
label += " for {0} minute{1}".F(totalMinutes, totalMinutes > 1 ? "s" : "");
}
return game.Protected ? label + " (Password protected)" : label;