fix: 入力デバイスPI版でシナリオを再読込するとエラーが発生する不具合を修正

automatic9045 · Oct 11, 2023 · 573056d · 573056d
1 parent f0e2fc3
commit 573056d
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/AtsEx/BveHacker/BveHacker.cs b/AtsEx/BveHacker/BveHacker.cs
@@ -54,6 +54,8 @@ static BveHacker()
 
         private readonly StructureSetLifeProlonger StructureSetLifeProlonger;
 
+        private ScenarioInfo TargetScenarioInfo = null;
+
         public BveHacker(BveTypeSet bveTypes)
         {
             BveTypes = bveTypes;
@@ -85,8 +87,9 @@ public BveHacker(BveTypeSet bveTypes)
                     LoadScenarioPatch.Invoked += (sender, e) =>
                     {
                         ScenarioInfo scenarioInfo = ScenarioInfo.FromSource(e.Args[0]);
-                        _MapHeaders = HeaderSet.FromMap(scenarioInfo.RouteFiles.SelectedFile.Path);
+                        TargetScenarioInfo = scenarioInfo;
 
+                        _MapHeaders = HeaderSet.FromMap(scenarioInfo.RouteFiles.SelectedFile.Path);
                         ScenarioHacker.BeginObserveInitialization();
 
                         ScenarioOpened?.Invoke(this, EventArgs.Empty);
@@ -96,8 +99,13 @@ public BveHacker(BveTypeSet bveTypes)
 
                     DisposeScenarioPatch.Invoked += (sender, e) =>
                     {
-                        _MapHeaders = null;
-                        _MapStatements = null;
+                        if (ScenarioInfo == TargetScenarioInfo)
+                        {
+                            _MapHeaders = null;
+                            _MapStatements = null;
+
+                            TargetScenarioInfo = null;
+                        }
 
                         ScenarioClosed?.Invoke(this, EventArgs.Empty);