Fixed ArgumentNullException crash on Devices.ReloadSelectedDevice

KinectToVR · Feb 21, 2023 · c30e87c · c30e87c
1 parent 271c0cb
commit c30e87c
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/Amethyst/Classes/Shared.cs b/Amethyst/Classes/Shared.cs
@@ -290,6 +290,10 @@ public static async Task ReloadSelectedDevice(bool manual, bool reconnect = fals
             // Update GeneralPage status
             TrackingDevices.UpdateTrackingDevicesInterface();
 
+            // Overwrite the selected device if still null for some reason
+            AppData.Settings.SelectedTrackingDeviceGuid ??= AppData.Settings.TrackingDeviceGuid;
+            AppData.Settings.PreviousSelectedTrackingDeviceGuid ??= AppData.Settings.TrackingDeviceGuid;
+
             // Refresh the device MVVM
             TrackingDevices.TrackingDevicesList[AppData.Settings.SelectedTrackingDeviceGuid].OnPropertyChanged();