From b4c9c19cce183478b6e840bb6f816393f5bd3630 Mon Sep 17 00:00:00 2001
From: Paul Chote <pchote@users.noreply.github.com>
Date: Mon, 15 Dec 2014 18:07:44 +1300
Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20crash=20when=20saving=20automat?=
 =?UTF-8?q?ically-upgraded=20maps.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OpenRA.Game/Map/Map.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/OpenRA.Game/Map/Map.cs b/OpenRA.Game/Map/Map.cs
index 18e13492e5..913a93e966 100644
--- a/OpenRA.Game/Map/Map.cs
+++ b/OpenRA.Game/Map/Map.cs
@@ -311,6 +311,12 @@ namespace OpenRA
 			LastSubCell = (SubCell)(SubCellOffsets.Length - 1);
 			DefaultSubCell = (SubCell)Game.modData.Manifest.SubCellDefaultIndex;
 
+			if (Container.Exists("map.png"))
+				using (var dataStream = Container.GetContent("map.png"))
+					CustomPreview = new Bitmap(dataStream);
+
+			PostInit();
+
 			// The Uid is calculated from the data on-disk, so
 			// format changes must be flushed to disk.
 			// TODO: this isn't very nice
@@ -318,12 +324,6 @@ namespace OpenRA
 				Save(path);
 
 			Uid = ComputeHash();
-
-			if (Container.Exists("map.png"))
-				using (var dataStream = Container.GetContent("map.png"))
-					CustomPreview = new Bitmap(dataStream);
-
-			PostInit();
 		}
 
 		void PostInit()