From b34b8352b637cab01118890cbbe273bdbbfb25a3 Mon Sep 17 00:00:00 2001 From: Salvador Cipolla Date: Sat, 7 Sep 2024 14:01:36 -0300 Subject: [PATCH] Consider that vjoy can have repeated guid with different ids --- Knossos.NET/ViewModels/GlobalSettingsViewModel.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Knossos.NET/ViewModels/GlobalSettingsViewModel.cs b/Knossos.NET/ViewModels/GlobalSettingsViewModel.cs index 1137a745..c6ab6d4c 100644 --- a/Knossos.NET/ViewModels/GlobalSettingsViewModel.cs +++ b/Knossos.NET/ViewModels/GlobalSettingsViewModel.cs @@ -566,7 +566,7 @@ public void LoadData() if(item.Tag != null) { var joystick = (Joystick)item.Tag; - if (joystick.guid == Knossos.globalSettings.joystick1.guid) + if (joystick.guid == Knossos.globalSettings.joystick1.guid && joystick.id == Knossos.globalSettings.joystick1.id) { var index = Joystick1Items.IndexOf(item); if (index != -1) @@ -599,7 +599,7 @@ public void LoadData() if (item.Tag != null) { var joystick = (Joystick)item.Tag; - if (joystick.guid == Knossos.globalSettings.joystick2.guid) + if (joystick.guid == Knossos.globalSettings.joystick2.guid && joystick.id == Knossos.globalSettings.joystick2.id) { var index = Joystick2Items.IndexOf(item); if (index != -1) @@ -632,7 +632,7 @@ public void LoadData() if (item.Tag != null) { var joystick = (Joystick)item.Tag; - if (joystick.guid == Knossos.globalSettings.joystick3.guid) + if (joystick.guid == Knossos.globalSettings.joystick3.guid && joystick.id == Knossos.globalSettings.joystick3.id) { var index = Joystick3Items.IndexOf(item); if (index != -1) @@ -665,7 +665,7 @@ public void LoadData() if (item.Tag != null) { var joystick = (Joystick)item.Tag; - if (joystick.guid == Knossos.globalSettings.joystick4.guid) + if (joystick.guid == Knossos.globalSettings.joystick4.guid && joystick.id == Knossos.globalSettings.joystick4.id) { var index = Joystick4Items.IndexOf(item); if (index != -1)