From 2cdcd0f590db1110b93cde9e30073bbb5bd8c37c Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Thu, 25 Dec 2014 17:05:01 +1300 Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20crash=20if=20a=20replay=20can?= =?UTF-8?q?=E2=80=99t=20be=20loaded.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenRA.Game/Network/UnitOrders.cs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/OpenRA.Game/Network/UnitOrders.cs b/OpenRA.Game/Network/UnitOrders.cs index 4a1d1d2818..7a88bd5c18 100644 --- a/OpenRA.Game/Network/UnitOrders.cs +++ b/OpenRA.Game/Network/UnitOrders.cs @@ -93,6 +93,15 @@ namespace OpenRA.Network case "StartGame": { + if (Game.modData.MapCache[orderManager.LobbyInfo.GlobalSettings.Map].Status != MapStatus.Available) + { + Game.Disconnect(); + Game.LoadShellMap(); + + // TODO: After adding a startup error dialog, notify the replay load failure. + break; + } + Game.AddChatLine(Color.White, "Server", "The game has started."); Game.StartGame(orderManager.LobbyInfo.GlobalSettings.Map, false); break;