Bugfix for pal target selection breaking after re-running solver

tylercamp · Apr 14, 2024 · 7c5f0b0 · 7c5f0b0
1 parent dc2d200
commit 7c5f0b0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/PalCalc.UI/ViewModel/MainWindowViewModel.cs b/PalCalc.UI/ViewModel/MainWindowViewModel.cs
@@ -69,7 +69,11 @@ private void UpdateTargetsList()
             UpdatePalTarget();
         }
 
-        private void UpdatePalTarget() => PalTarget = new PalTargetViewModel(PalTargetList.SelectedTarget);
+        private void UpdatePalTarget()
+        {
+            if (PalTargetList.SelectedTarget !=  null)
+                PalTarget = new PalTargetViewModel(PalTargetList.SelectedTarget);
+        }
 
         private void SaveSelection_PropertyChanged(object sender, PropertyChangedEventArgs e)
         {
@@ -103,7 +107,8 @@ public void RunSolver()
             }
             else
             {
-                PalTarget.InitialPalSpecifier.CopyFrom(PalTarget.CurrentPalSpecifier);
+                PalTargetList.Replace(PalTarget.InitialPalSpecifier, PalTarget.CurrentPalSpecifier);
+                PalTargetList.SelectedTarget = PalTarget.CurrentPalSpecifier;
             }
 
             var outputFolder = Storage.SaveFileDataPath(SaveSelection.SelectedGame.Value);

diff --git a/PalCalc.UI/ViewModel/PalTargetListViewModel.cs b/PalCalc.UI/ViewModel/PalTargetListViewModel.cs
@@ -45,5 +45,11 @@ public PalTargetListViewModel(IEnumerable<PalSpecifierViewModel> existingSpecs)
         private PalSpecifierViewModel selectedTarget;
 
         public void Add(PalSpecifierViewModel value) => targets.Insert(1, value);
+
+        public void Replace(PalSpecifierViewModel oldValue, PalSpecifierViewModel newValue)
+        {
+            var oldIndex = targets.IndexOf(oldValue);
+            targets[oldIndex] = newValue;
+        }
     }
 }