From fc07f90f913826e97ed41937535938fe1d42a636 Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Sat, 16 Oct 2010 12:06:29 +1300
Subject: [PATCH] Fix editor

---
 OpenRA.Editor/Form1.cs            | 2 --
 OpenRA.FileFormats/Map/MapStub.cs | 2 +-
 OpenRA.Game/Map.cs                | 2 ++
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/OpenRA.Editor/Form1.cs b/OpenRA.Editor/Form1.cs
index 7cab27959e..ef4855a62c 100644
--- a/OpenRA.Editor/Form1.cs
+++ b/OpenRA.Editor/Form1.cs
@@ -240,7 +240,6 @@ namespace OpenRA.Editor
 			else
 			{
 				surface1.Map.PlayerCount = surface1.Map.Waypoints.Count;
-				surface1.Map.Package = new Folder(loadedMapName);
 				surface1.Map.Save(loadedMapName);
 				dirty = false;
 			}
@@ -364,7 +363,6 @@ namespace OpenRA.Editor
 					Directory.CreateDirectory(savePath);
 
 					var map = LegacyMapImporter.Import(ofd.FileName);
-					map.Package = new Folder(savePath);
 					map.Players.Add("Neutral", new PlayerReference("Neutral",
 						Rules.Info["world"].Traits.WithInterface<CountryInfo>().First().Race, true, true));
 
diff --git a/OpenRA.FileFormats/Map/MapStub.cs b/OpenRA.FileFormats/Map/MapStub.cs
index 5dd7cd73d9..d043791a9c 100644
--- a/OpenRA.FileFormats/Map/MapStub.cs
+++ b/OpenRA.FileFormats/Map/MapStub.cs
@@ -17,7 +17,7 @@ namespace OpenRA.FileFormats
 {
 	public class MapStub
 	{
-		public readonly IFolder Package;
+		public IFolder Package { get; protected set; }
 		
 		// Yaml map data
 		public string Uid { get; protected set; }
diff --git a/OpenRA.Game/Map.cs b/OpenRA.Game/Map.cs
index b65c197265..4fccdaf239 100755
--- a/OpenRA.Game/Map.cs
+++ b/OpenRA.Game/Map.cs
@@ -183,6 +183,8 @@ namespace OpenRA
 
 		public void Save(string filepath)
 		{
+			// Todo: save to a zip file in the support dir by default
+			Package = new Folder(filepath);
 			MapFormat = 3;
 			
 			var root = new List<MiniYamlNode>();