diff --git a/src/Artemis.UI.Linux/Utilities/InputUtilities.cs b/src/Artemis.UI.Linux/Utilities/InputUtilities.cs index f898ebb1e..1b567245a 100644 --- a/src/Artemis.UI.Linux/Utilities/InputUtilities.cs +++ b/src/Artemis.UI.Linux/Utilities/InputUtilities.cs @@ -52,7 +52,7 @@ public static class InputUtilities LinuxKeyboardKeyCodes.KEY_APOSTROPHE => KeyboardKey.OemQuotes, LinuxKeyboardKeyCodes.KEY_GRAVE => KeyboardKey.OemTilde, LinuxKeyboardKeyCodes.KEY_LEFTSHIFT => KeyboardKey.LeftShift, - LinuxKeyboardKeyCodes.KEY_BACKSLASH => KeyboardKey.OemBackslash, + LinuxKeyboardKeyCodes.KEY_BACKSLASH => KeyboardKey.OemPipe, LinuxKeyboardKeyCodes.KEY_Z => KeyboardKey.Z, LinuxKeyboardKeyCodes.KEY_X => KeyboardKey.X, LinuxKeyboardKeyCodes.KEY_C => KeyboardKey.C, @@ -94,7 +94,7 @@ public static class InputUtilities LinuxKeyboardKeyCodes.KEY_KP0 => KeyboardKey.NumPad0, LinuxKeyboardKeyCodes.KEY_KPDOT => KeyboardKey.NumPadDecimal, // LinuxKeyboardKeyCodes.KEY_ZENKAKUHANKAKU => expr, - // LinuxKeyboardKeyCodes.KEY_102ND => expr, + LinuxKeyboardKeyCodes.KEY_102ND => KeyboardKey.OemBackslash, LinuxKeyboardKeyCodes.KEY_F11 => KeyboardKey.F11, LinuxKeyboardKeyCodes.KEY_F12 => KeyboardKey.F12, //LinuxKeyboardKeyCodes.KEY_RO => expr, diff --git a/src/Artemis.UI/Screens/Device/DeviceDetectInputViewModel.cs b/src/Artemis.UI/Screens/Device/DeviceDetectInputViewModel.cs index ee5d0922a..b915e14c6 100644 --- a/src/Artemis.UI/Screens/Device/DeviceDetectInputViewModel.cs +++ b/src/Artemis.UI/Screens/Device/DeviceDetectInputViewModel.cs @@ -7,6 +7,7 @@ using Artemis.Core.Services; using Artemis.UI.Shared; using Artemis.UI.Shared.Services; using Artemis.UI.Shared.Services.Builders; +using Avalonia.Threading; using FluentAvalonia.UI.Controls; using ReactiveUI; using RGB.NET.Core; @@ -57,10 +58,13 @@ public class DeviceDetectInputViewModel : ContentDialogViewModelBase private void InputServiceOnDeviceIdentified() { - ContentDialog?.Hide(ContentDialogResult.Primary); - _notificationService.CreateNotification() - .WithMessage($"{Device.RgbDevice.DeviceInfo.DeviceName} identified 😁") - .WithSeverity(NotificationSeverity.Success) - .Show(); + Dispatcher.UIThread.Post(() => + { + ContentDialog?.Hide(ContentDialogResult.Primary); + _notificationService.CreateNotification() + .WithMessage($"{Device.RgbDevice.DeviceInfo.DeviceName} identified 😁") + .WithSeverity(NotificationSeverity.Success) + .Show(); + }); } } \ No newline at end of file