From aeb9f4e441cdb47ce1eed32207c575478dc5080f Mon Sep 17 00:00:00 2001
From: Bob <ytinasni@gmail.com>
Date: Sat, 21 Aug 2010 19:20:06 +1200
Subject: [PATCH] moved call to FindMaps into ChangeMods

---
 OpenRA.Game/Game.cs | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs
index 42ff20938a..9878cabfcd 100644
--- a/OpenRA.Game/Game.cs
+++ b/OpenRA.Game/Game.cs
@@ -65,12 +65,11 @@ namespace OpenRA
 
 		static void ChangeMods()
 		{
-			Timer.Time( "----ChangeMods" );
+			AvailableMaps = FindMaps(LobbyInfo.GlobalSettings.Mods);
+
 			modData = new ModData( LobbyInfo.GlobalSettings.Mods );
 
 			ChromeProvider.Initialize( modData.Manifest.Chrome );
-			packageChangePending = false;
-			Timer.Time( "load assemblies, packages: {0}" );
 		}
 
 		static void LoadMap(string mapName)
@@ -157,10 +156,8 @@ namespace OpenRA
 			if (packageChangePending)
 			{
 				// TODO: Only do this on mod change
-				Timer.Time("----begin maplist");
-				AvailableMaps = FindMaps(LobbyInfo.GlobalSettings.Mods);
-				Timer.Time("maplist: {0}");
 				ChangeMods();
+				packageChangePending = false;
 				return;
 			}
 
@@ -388,7 +385,6 @@ namespace OpenRA
 			PerfHistory.items["batches"].hasNormalTick = false;
 			PerfHistory.items["text"].hasNormalTick = false;
 			PerfHistory.items["cursor"].hasNormalTick = false;
-			AvailableMaps = FindMaps(LobbyInfo.GlobalSettings.Mods);
 
 			ChangeMods();