diff --git a/MobiFlight/MobiFlightCache.cs b/MobiFlight/MobiFlightCache.cs index 98d61580b..43fc93738 100644 --- a/MobiFlight/MobiFlightCache.cs +++ b/MobiFlight/MobiFlightCache.cs @@ -247,11 +247,11 @@ private static List getSupportedPorts() { // Issue #1122: A corrupted WMI registry caused exceptions when attempting to enumerate connected devices with searcher.Get(). // Running "winmgmt /resetrepository" fixed it. - Log.Instance.log($"Unable to read connected devices. This is usually caused by a corrupted WMI registry. Run 'winmgmt /resetrepository' from an elevated command line to resolve the issue. (${ex.Message})", LogSeverity.Error); + Log.Instance.log($"Unable to read connected devices. This is usually caused by a corrupted WMI registry. Run 'winmgmt /resetrepository' from an elevated command line to resolve the issue. ({ex.Message})", LogSeverity.Error); } catch (Exception ex) { - Log.Instance.log($"Unable to read connected devices: ${ex.Message}", LogSeverity.Error); + Log.Instance.log($"Unable to read connected devices: {ex.Message}", LogSeverity.Error); } return result; } diff --git a/SimConnectMSFS/SimConnectCache.cs b/SimConnectMSFS/SimConnectCache.cs index 0c970f132..8cf3a98b3 100644 --- a/SimConnectMSFS/SimConnectCache.cs +++ b/SimConnectMSFS/SimConnectCache.cs @@ -223,8 +223,6 @@ internal void Start() private void SimConnectCache_OnRecvClientData(SimConnect sender, SIMCONNECT_RECV_CLIENT_DATA data) { - - if (data.dwRequestID != 0) { var simData = (ClientDataValue)(data.dwData[0]); diff --git a/UI/Dialogs/ConfigWizard.cs b/UI/Dialogs/ConfigWizard.cs index e2f5df969..7ba8d56e8 100644 --- a/UI/Dialogs/ConfigWizard.cs +++ b/UI/Dialogs/ConfigWizard.cs @@ -218,7 +218,7 @@ protected void _AddJoysticks(List DisplayModuleList) DisplayModuleList.Add(new ListItem() { - Value = $"{joystick.Name} ${SerialNumber.SerialSeparator}${joystick.Serial}", + Value = $"{joystick.Name} {SerialNumber.SerialSeparator}{joystick.Serial}", Label = $"{joystick.Name}" }); diff --git a/UI/Dialogs/InputConfigWizard.cs b/UI/Dialogs/InputConfigWizard.cs index 50c488317..dbf8c6eeb 100644 --- a/UI/Dialogs/InputConfigWizard.cs +++ b/UI/Dialogs/InputConfigWizard.cs @@ -187,7 +187,7 @@ public void initWithArcazeCache(ArcazeCache arcazeCache) arcazeFirmware[module.Serial] = module.Version; PreconditionModuleList.Add(new ListItem() { - Value = $"{module.Name}${SerialNumber.SerialSeparator}{module.Serial}", + Value = $"{module.Name}{SerialNumber.SerialSeparator}{module.Serial}", Label = $"{module.Name} ({module.Serial})" }); } @@ -196,7 +196,7 @@ public void initWithArcazeCache(ArcazeCache arcazeCache) { inputModuleNameComboBox.Items.Add(new ListItem() { - Value = $"{module.Name}${SerialNumber.SerialSeparator}{module.Serial}", + Value = $"{module.Name}{SerialNumber.SerialSeparator}{module.Serial}", Label = $"{module.Name} ({module.Port})" }); } @@ -206,7 +206,7 @@ public void initWithArcazeCache(ArcazeCache arcazeCache) if (joystick.GetAvailableDevices().Count > 0) inputModuleNameComboBox.Items.Add(new ListItem() { - Value = $"{joystick.Name} ${SerialNumber.SerialSeparator}{joystick.Serial}", + Value = $"{joystick.Name} {SerialNumber.SerialSeparator}{joystick.Serial}", Label = $"{joystick.Name}" }); } @@ -230,8 +230,8 @@ public void initWithoutArcazeCache() { inputModuleNameComboBox.Items.Add(new ListItem() { - Value = $"{module.Name}${SerialNumber.SerialSeparator}{module.Serial}", - Label = $"{module.Name}${SerialNumber.SerialSeparator}({module.Port})" + Value = $"{module.Name}{SerialNumber.SerialSeparator}{module.Serial}", + Label = $"{module.Name}{SerialNumber.SerialSeparator}({module.Port})" }); // preconditionPinSerialComboBox.Items.Add(module.Name + "/ " + module.Serial); } @@ -240,7 +240,7 @@ public void initWithoutArcazeCache() { inputModuleNameComboBox.Items.Add(new ListItem() { - Value = $"{joystick.Name} ${SerialNumber.SerialSeparator}{joystick.Serial}", + Value = $"{joystick.Name} {SerialNumber.SerialSeparator}{joystick.Serial}", Label = $"{joystick.Name}" }); }