restore reference between Mode and ButtonMap

joekolodz · Jul 25, 2022 · 675ffe7 · 675ffe7
1 parent e94268c
commit 675ffe7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/Models/HOTASDevice.cs b/src/Models/HOTASDevice.cs
@@ -96,7 +96,9 @@ public void SetMode(Dictionary<int, ObservableCollection<IHotasBaseMap>> profile
         {
             Modes = profile;
             if (Modes.Count < 1) return;
-            ApplyButtonMap(profile[Modes.Keys.Min()].ToObservableCollection());
+
+            ApplyButtonMap(Modes[Modes.Keys.Min()].ToObservableCollection());
+            Modes[Modes.Keys.Min()] = ButtonMap;
         }
 
         //todo pass in the mode profile key for the profile you want to template from
@@ -318,7 +320,7 @@ public void ApplyButtonMap(ObservableCollection<IHotasBaseMap> existingButtonMap
                 //existingButtonMap is assumed to have less button entries in this scenario. So we want to copy the data from existingButtonMap for any buttons that match between the two lists
                 //Any buttons that don't match means that the device has more buttons than are in the existingButtonMap list and so there is nothing to copy
                 //If the device has fewer buttons than exist on the existingButtonMap, then those buttons are not copied over and lost
-                ButtonMap = new ObservableCollection<IHotasBaseMap>();
+                ButtonMap?.Clear();
                 SeedButtonMapFromDeviceCapabilities(ButtonMap);
                 foreach (var source in existingButtonMap)
                 {

diff --git a/src/ViewModels/HOTASCollectionViewModel.cs b/src/ViewModels/HOTASCollectionViewModel.cs
@@ -417,8 +417,8 @@ private void BuildDevicesViewModelFromLoadedDevices(IHOTASCollection loadedDevic
                     if (d == null) continue;
                 }
                 d.SetMode(ld.Modes);
-                ReBuildActionsFromCatalog(deviceVm);
-                deviceVm.RebuildMap(d.ButtonMap);
+                ReBuildActionsFromCatalog(deviceVm);//assign each button their actions
+                deviceVm.RebuildMap(d.ButtonMap);//recreate the view model for each button now that the actions are assigned
             }
         }
 
@@ -495,7 +495,7 @@ private void ResetProfile()
                 deviceVm.ClearButtonMap();
                 deviceVm.RebuildMap();
             }
-            
+
             OnPropertyChanged(nameof(ModeActivationItems));
 
             _fileSystem.LastSavedFileName = "";