Fix device type not being set when WinUSB backend starts

TheNathannator · Nov 23, 2023 · 43d4f1e · 43d4f1e
1 parent 3ee5dd7
commit 43d4f1e
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/Program/MainWindow/MainWindow.xaml.cs b/Program/MainWindow/MainWindow.xaml.cs
@@ -99,11 +99,6 @@ private void Window_Loaded(object sender, RoutedEventArgs e)
             SetPacketDebugLog(Settings.Default.packetDebugLog);
             SetVerboseErrors(Settings.Default.verboseErrorLog);
 
-            // Load backend settings
-            SetPcapEnabled(Settings.Default.pcapEnabled);
-            SetUsbEnabled(Settings.Default.usbEnabled);
-            // Device type is set after initializing the clients
-
             // Check for vJoy
             bool vjoyFound = VjoyClient.Enabled;
             if (vjoyFound)
@@ -143,9 +138,11 @@ private void Window_Loaded(object sender, RoutedEventArgs e)
                 vigemDeviceTypeOption.IsSelected = false;
             }
 
-            // Set device type
-            var deviceType = (ControllerType)Settings.Default.controllerDeviceType;
-            SetDeviceType(deviceType);
+            // Load backend settings
+            // Done after initializing virtual controller clients
+            SetDeviceType((ControllerType)Settings.Default.controllerDeviceType);
+            SetPcapEnabled(Settings.Default.pcapEnabled);
+            SetUsbEnabled(Settings.Default.usbEnabled);
 
             // Exit if neither ViGEmBus nor vJoy are installed
             if (!vjoyFound && !vigemFound)