Rework automatic updatemapfiles

TheGuardians · May 1, 2024 · 127f3b2 · 127f3b2
1 parent cd1ca42
commit 127f3b2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/TagTool/Commands/Files/UpdateMapFilesCommand.cs b/TagTool/Commands/Files/UpdateMapFilesCommand.cs
@@ -121,7 +121,9 @@ public override object Execute(List<string> args)
                             var scnr = Cache.Deserialize<Scenario>(tagStream, scenario);
 
                             var mapBuilder = new MapFileBuilder(Cache.Version);
-                            mapBuilder.MapInfo = mapInfo.Scenario;
+                            if (mapInfo != null)
+                                mapBuilder.MapInfo = mapInfo.Scenario;
+
                             map = mapBuilder.Build(scenario, scnr);
                         }
 

diff --git a/TagTool/Commands/Porting/PortTagCommand.cs b/TagTool/Commands/Porting/PortTagCommand.cs
@@ -58,6 +58,7 @@ public partial class PortTagCommand : Command
 		};
 
 		private readonly Dictionary<Tag, CachedTag> DefaultTags = new Dictionary<Tag, CachedTag> { };
+		private bool ScenarioPort = false;
 
 		public PortTagCommand(GameCacheHaloOnlineBase cacheContext, GameCache blamCache) :
 			base(true,
@@ -168,6 +169,9 @@ public override object Execute(List<string> args)
 
 			ProcessDeferredActions();
 
+			if (ScenarioPort && FlagIsSet(PortingFlags.UpdateMapFiles))
+				new UpdateMapFilesCommand(CacheContext).Execute(new List<string> { });
+
 			return true;
 		}
 
@@ -1256,13 +1260,7 @@ public CachedTag ConvertTagInternal(Stream cacheStream, Stream blamCacheStream,
                             }
                         }
 
-                        if (Flags.HasFlag(PortingFlags.UpdateMapFiles))
-                        {
-                            _deferredActions.Add(() =>
-                            {
-                                new UpdateMapFilesCommand(CacheContext).Execute(new List<string> { });
-                            });
-                        }
+                        ScenarioPort = true;
                     }
                     break;