Merge 3e69afd110 into 52b0b45d34

This is an attempt to decouple "saving gamepad settings" from the rest of the emulator settings. Should fix the issue where the gamepad was not detected when starting the emulator and the game (usually after saving settings with the gamepad turned off)

docs/compatibility.csv

@@ -1159,7 +1159,7 @@
 010095600AA36000,"Fill-a-Pix: Phil's Epic Adventure",,playable,2020-12-22 13:48:22
 0100C3A00BB76000,"Fimbul",nvdec,playable,2022-07-26 13:31:47
 0100C8200E942000,"Fin and the Ancient Mystery",nvdec,playable,2020-12-17 16:40:39
-01000EA014150000,"FINAL FANTASY",crash,nothing,2024-09-05 20:55:30
+01000EA014150000,"FINAL FANTASY",,playable,2025-02-16 21:27:30
 01006B7014156000,"FINAL FANTASY II",crash,nothing,2024-04-13 19:18:04
 01006F000B056000,"FINAL FANTASY IX",audout;nvdec,playable,2021-06-05 11:35:00
 0100AA201415C000,"FINAL FANTASY V",,playable,2023-04-26 01:11:55
@@ -2839,6 +2839,7 @@
 01009B90006DC000,"Super Mario Maker™ 2",online-broken;ldn-broken,playable,2024-08-25 11:05:19
 0100000000010000,"Super Mario Odyssey™",nvdec;intel-vendor-bug;mac-bug,playable,2024-08-25 01:32:34
 010036B0034E4000,"Super Mario Party™",gpu;Needs Update;ldn-works,ingame,2024-06-21 05:10:16
+0100965017338000,"Super Mario Party Jamboree",mac-bug;gpu,ingame,2025-02-17 02:09:20
 0100BC0018138000,"Super Mario RPG™",gpu;audio;nvdec,ingame,2024-06-19 17:43:42
 ,"Super Mario World",homebrew,boots,2024-06-13 01:40:31
 010049900F546000,"Super Mario™ 3D All-Stars",services-horizon;slow;vulkan;amd-vendor-bug,ingame,2024-05-07 02:38:16

src/Ryujinx.Common/TitleIDs.cs

@@ -53,10 +53,9 @@ namespace Ryujinx.Common
             "0100000000010000", // Super Mario Odyssey
 
             // Further testing is appreciated, I did not test the entire game:
-            "01007300020fa000", // Astral Chain
+            //"010076f0049a2000", // Bayonetta
-            "010076f0049a2000", // Bayonetta
+            //"0100cf5010fec000", // Bayonetta Origins: Cereza and the Lost Demon
-            "0100cf5010fec000", // Bayonetta Origins: Cereza and the Lost Demon
+            //"0100f4300bf2c000", // New Pokemon Snap
-            "0100f4300bf2c000", // New Pokemon Snap
         ];
         
         public static string GetDiscordGameAsset(string titleId) 
@@ -230,6 +229,7 @@ namespace Ryujinx.Common
             "01008c8012920000", // Dying Light Platinum Edition
             "01001cc01b2d4000", // Goat Simulator 3
             "01003620068ea000", // Hand of Fate 2
+            "0100f7e00c70e000", // Hogwarts Legacy
             "010085500130a000", // Lego City: Undercover
             "010073c01af34000", // LEGO Horizon Adventures
             "0100d71004694000", // Minecraft

src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/LdnRyu/Proxy/P2pProxyServer.cs

@@ -113,7 +113,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu.Proxy
         public async Task<ushort> NatPunch()
         {
             NatDiscoverer discoverer = new();
-            CancellationTokenSource cts = new(5000);
+            CancellationTokenSource cts = new(2500);
 
             NatDevice device;
 

src/Ryujinx/Headless/HeadlessRyujinx.cs

@@ -289,7 +289,8 @@ namespace Ryujinx.Headless
 
             DriverUtilities.InitDriverConfig(option.BackendThreading == BackendThreading.Off);
             
-            if (_inputConfiguration.OfType<StandardControllerInputConfig>().Any(ic => ic.Led.UseRainbow))
+            if (_inputConfiguration.OfType<StandardControllerInputConfig>()
+                .Any(ic => ic?.Led?.UseRainbow ?? false))
                 Rainbow.Enable();
 
             while (true)

src/Ryujinx/Program.cs

@@ -47,6 +47,7 @@ namespace Ryujinx.Ava
             if (OperatingSystem.IsWindows() && !OperatingSystem.IsWindowsVersionAtLeast(10, 0, 19041))
             {
                 _ = MessageBoxA(nint.Zero, "You are running an outdated version of Windows.\n\nRyujinx supports Windows 10 version 20H1 and newer.\n", $"Ryujinx {Version}", MbIconwarning);
+                return 0;
             }
 
             PreviewerDetached = true;

src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs

@@ -52,6 +52,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         [ObservableProperty] private object _configViewModel;
         [ObservableProperty] private string _profileName;
         private bool _isLoaded;
+        public bool InitInputPage { get; set; }
 
         private static readonly InputConfigJsonSerializerContext _serializerContext = new(JsonHelper.GetDefaultSerializerOptions());
 
@@ -92,6 +93,8 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         public bool CanClearLed => SelectedGamepad.Name.ContainsIgnoreCase("DualSense");
 
         public bool IsModified { get; set; }
+        public bool IsInputConfigChanged { get; set; }
+
         public event Action NotifyChangesEvent;
 
         public PlayerIndex PlayerIdChoose
@@ -121,13 +124,12 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
                 }
                 _isLoaded = false;
-
                 LoadConfiguration();
                 LoadDevice();
                 LoadProfiles();
 
                 _isLoaded = true;
-
+               
                 OnPropertyChanged();
             }
         }
@@ -296,7 +298,10 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             {
                 ConfigViewModel = new ControllerInputViewModel(this, new GamepadInputConfig(controllerInputConfig));
             }
-        }
+
+            IsInputConfigChanged |= InitInputPage; // If the field has been changed, the control settings will be overwritten
+            InitInputPage = true; // initialization variable
+        } 
 
         public void LoadDevice()
         {
@@ -817,6 +822,13 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         {
             IsModified = false;
 
+            if (!IsInputConfigChanged)
+            {
+                return; //If the input settings were not touched, then do nothing
+            }
+
+            IsInputConfigChanged = false; // Input settings have been changed
+
             List<InputConfig> newConfig = [];
 
             newConfig.AddRange(ConfigurationState.Instance.Hid.InputConfig.Value);

src/Ryujinx/UI/Views/Input/ControllerInputView.axaml.cs

@@ -65,6 +65,9 @@ namespace Ryujinx.Ava.UI.Views.Input
                 if (!float.IsNaN(_changeSlider) && _changeSlider != (float)check.Value)
                 {
                     (DataContext as ControllerInputViewModel)!.ParentModel.IsModified = true;
+
+                    FlagInputConfigChanged();
+
                     _changeSlider = (float)check.Value;
                 }
             }
@@ -75,6 +78,9 @@ namespace Ryujinx.Ava.UI.Views.Input
             if (sender is CheckBox { IsPointerOver: true })
             {
                 (DataContext as ControllerInputViewModel)!.ParentModel.IsModified = true;
+
+                FlagInputConfigChanged();
+
                 _currentAssigner?.Cancel();
                 _currentAssigner = null;
             }
@@ -102,6 +108,8 @@ namespace Ryujinx.Ava.UI.Views.Input
 
                         PointerPressed += MouseClick;
 
+                        FlagInputConfigChanged();
+
                         ControllerInputViewModel viewModel = (DataContext as ControllerInputViewModel);
 
                         IKeyboard keyboard =
@@ -208,6 +216,11 @@ namespace Ryujinx.Ava.UI.Views.Input
             }
         }
 
+        private void FlagInputConfigChanged()
+        {
+            (DataContext as ControllerInputViewModel)!.ParentModel.IsInputConfigChanged = true;
+        }
+
         private void MouseClick(object sender, PointerPressedEventArgs e)
         {
             bool shouldUnbind = e.GetCurrentPoint(this).Properties.IsMiddleButtonPressed;
@@ -239,7 +252,6 @@ namespace Ryujinx.Ava.UI.Views.Input
             {
                 gamepad?.ClearLed();
             }
-            
             _currentAssigner?.Cancel();
             _currentAssigner = null;
         }

src/Ryujinx/UI/Views/Input/InputView.axaml.cs

@@ -48,6 +48,7 @@ namespace Ryujinx.Ava.UI.Views.Input
 
                 if (result == UserResult.Yes)
                 {
+                    ViewModel.InitInputPage = false;
                     ViewModel.Save();
                 }
 

src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml.cs

@@ -60,6 +60,8 @@ namespace Ryujinx.Ava.UI.Views.Input
 
                     PointerPressed += MouseClick;
 
+                    FlagInputConfigChanged();
+
                     if (DataContext is not KeyboardInputViewModel viewModel)
                         return;
 
@@ -184,6 +186,11 @@ namespace Ryujinx.Ava.UI.Views.Input
             }
         }
 
+        private void FlagInputConfigChanged()
+        {
+            (DataContext as KeyboardInputViewModel)!.ParentModel.IsInputConfigChanged = true;
+        }
+
         private void MouseClick(object sender, PointerPressedEventArgs e)
         {
             bool shouldUnbind = e.GetCurrentPoint(this).Properties.IsMiddleButtonPressed;