From 24cef89b6ce7dccd399fa882a735284f38a760c4 Mon Sep 17 00:00:00 2001
From: uncavo-hdmi <davide.saladino@studenti.unipd.it>
Date: Sun, 26 Jan 2025 23:52:44 +0100
Subject: [PATCH] refactor: clean up logging and improve IgnoreApplet logic in
 settings

---
 src/Ryujinx.HLE/HOS/Services/Hid/HidDevices/NpadDevices.cs | 1 -
 src/Ryujinx.Input/HLE/NpadManager.cs                       | 2 +-
 src/Ryujinx/UI/ViewModels/SettingsViewModel.cs             | 2 +-
 src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml     | 1 +
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Ryujinx.HLE/HOS/Services/Hid/HidDevices/NpadDevices.cs b/src/Ryujinx.HLE/HOS/Services/Hid/HidDevices/NpadDevices.cs
index 0e622f3ad..834bee6f0 100644
--- a/src/Ryujinx.HLE/HOS/Services/Hid/HidDevices/NpadDevices.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Hid/HidDevices/NpadDevices.cs
@@ -175,7 +175,6 @@ namespace Ryujinx.HLE.HOS.Services.Hid
 
         private void Remap()
         {
-            Logger.Warning?.Print(LogClass.Hid, $"Connected controllers");
             // Remap/Init if necessary
             for (int i = 0; i < MaxControllers; ++i)
             {
diff --git a/src/Ryujinx.Input/HLE/NpadManager.cs b/src/Ryujinx.Input/HLE/NpadManager.cs
index ef91ce8e4..0cd51e918 100644
--- a/src/Ryujinx.Input/HLE/NpadManager.cs
+++ b/src/Ryujinx.Input/HLE/NpadManager.cs
@@ -173,7 +173,7 @@ namespace Ryujinx.Input.HLE
                         NpadController controller;
                         int index = controllers.FindIndex(x => x == activeController);
                 
-                        // TODO: Implement a function to determine if pro controller or single joycon (L/R) and to create the appropriate config.
+                        // TODO: Implement a function to determine if pro controller or single joycon (L/R) and create the appropriate config.
                         // Also if old controller exists, try to reuse it (and create their config too).
                         bool isNintendoStyle = controllers.FirstOrDefault(x => x.Id == activeController.Id).Name.Contains("Nintendo");
                         string id = activeController.Id.Split(" ")[0];
diff --git a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
index b637766a8..f7543d2bb 100644
--- a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
@@ -638,7 +638,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             config.System.EnableFsIntegrityChecks.Value = EnableFsIntegrityChecks;
             config.System.DramSize.Value = DramSize;
             config.System.IgnoreMissingServices.Value = IgnoreMissingServices;
-            config.System.IgnoreApplet.Value = IgnoreApplet;
+            config.System.IgnoreApplet.Value = (EnableAutoAssign) || IgnoreApplet;
 
             // CPU
             config.System.EnablePtc.Value = EnablePptc;
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
index d7cf60787..9d8902026 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
@@ -313,6 +313,7 @@
                         <TextBlock Text="{ext:Locale SettingsTabSystemIgnoreMissingServices}" />
                     </CheckBox>
                     <CheckBox 
+                        IsEnabled="{Binding !EnableAutoAssign}"
                         IsChecked="{Binding IgnoreApplet}"
                         ToolTip.Tip="{ext:Locale IgnoreAppletTooltip}">
                         <TextBlock Text="{ext:Locale SettingsTabSystemIgnoreApplet}" />