fix merge

2025-02-05 23:03:26 +08:00 · 2025-02-05 23:03:26 +08:00 · 0c94b7c0d5
commit 0c94b7c0d5
parent 5a6d532579
2 changed files with 1 additions and 2 deletions
--- a/src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs
@ -6,6 +6,7 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.HLE.FileSystem;
 using System;
+using System.Linq;

 namespace Ryujinx.Ava.UI.Windows
 {
--- a/src/Ryujinx/Utilities/Configuration/ConfigurationState.cs
+++ b/src/Ryujinx/Utilities/Configuration/ConfigurationState.cs
@ -130,8 +130,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
                EnableKeyboard = Hid.EnableKeyboard,
                EnableMouse = Hid.EnableMouse,
                Hotkeys = Hid.Hotkeys,
-                KeyboardConfig = [],
-                ControllerConfig = [],
                InputConfig = Hid.InputConfig,
                GraphicsBackend = Graphics.GraphicsBackend,
                PreferredGpu = Graphics.PreferredGpu,