From 9a54074b1beec66cc20028572eb419d835cf3bdc Mon Sep 17 00:00:00 2001
From: Caleb Anderson <caleb@l0ser.net>
Date: Fri, 15 Oct 2010 01:24:22 -0500
Subject: [PATCH] motd failure avoidance

---
 OpenRA.Game/Server/MasterServerQuery.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/OpenRA.Game/Server/MasterServerQuery.cs b/OpenRA.Game/Server/MasterServerQuery.cs
index 06a334d02c..812f68e31b 100755
--- a/OpenRA.Game/Server/MasterServerQuery.cs
+++ b/OpenRA.Game/Server/MasterServerQuery.cs
@@ -62,8 +62,13 @@ namespace OpenRA.Server
 				{
 					try
 					{
-						motd.SetText(GetData(new Uri(masterServerUrl + "motd.php?v=" + ClientVersion)));
-						motd.ResetScroll();
+						string motdText = GetData(new Uri(masterServerUrl + "motd.php?v=" + ClientVersion));
+						string[] p = motdText.Split('|');
+						if (p.Length == 2 && p[1].Length == int.Parse(p[0]))
+						{
+							motd.SetText(p[1]);
+							motd.ResetScroll();
+						}
 					}
 					catch
 					{