Remove save dialog when creating a new map.

OpenRA.Mods.Common/Widgets/Logic/Editor/NewMapLogic.cs

@@ -11,6 +11,7 @@
 
 using System;
 using System.Linq;
+using OpenRA.FileSystem;
 using OpenRA.Mods.Common.Terrain;
 using OpenRA.Widgets;
 
@@ -69,24 +70,12 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 				if (map.Rules.TerrainInfo is ITerrainInfoNotifyMapCreated notifyMapCreated)
 					notifyMapCreated.MapCreated(map);
 
-				Action<string> afterSave = uid =>
-				{
-					map.Dispose();
-					Game.LoadEditor(uid);
-
-					Ui.CloseWindow();
-					onSelect(uid);
-				};
-
-				Ui.OpenWindow("SAVE_MAP_PANEL", new WidgetArgs()
-				{
-					{ "onSave", afterSave },
-					{ "onExit", () => { Ui.CloseWindow(); onExit(); } },
-					{ "map", map },
-					{ "world", world },
-					{ "playerDefinitions", map.PlayerDefinitions },
-					{ "actorDefinitions", map.ActorDefinitions }
-				});
+				var package = new ZipFileLoader.ReadWriteZipFile();
+				map.Save(package);
+				map = new Map(modData, package);
+				Game.LoadEditor(map);
+				Ui.CloseWindow();
+				onSelect(map.Uid);
 			};
 		}
 	}

OpenRA.Mods.Common/Widgets/Logic/Editor/SaveMapLogic.cs

@@ -145,7 +145,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 					}
 				}
 
-				if (map.Package != null)
+				if (!string.IsNullOrEmpty(map.Package?.Name))
 				{
 					selectedDirectory = writableDirectories.FirstOrDefault(k => k.Folder.Contains(map.Package.Name));
 					selectedDirectory ??= writableDirectories.FirstOrDefault(k => Directory.GetDirectories(k.Folder.Name).Any(f => f.Contains(map.Package.Name)));