From ced618d9a194c8f78b976de9843a184b134b3529 Mon Sep 17 00:00:00 2001
From: Evan Husted <greem@greemdev.net>
Date: Mon, 17 Feb 2025 01:47:17 -0600
Subject: [PATCH] Enabled per-game configuration of discord presence

---
 .../UI/Views/Settings/SettingsUIView.axaml       | 16 ++++++----------
 .../ConfigurationState.Migration.cs              |  9 ++-------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
index 80f8e8c5f..2a46dcf49 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
@@ -26,16 +26,12 @@
                 Spacing="10">
                 <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralGeneral}" />
                 <StackPanel Margin="10,0,0,0" Orientation="Vertical">
-                    <CheckBox 
-                        IsEnabled="{Binding !IsGameTitleNotNull}"
-                        Opacity="{Binding PanelOpacity}"
-                        IsChecked="{Binding EnableDiscordIntegration}">
-                            <StackPanel Orientation="Horizontal">
-                                <TextBlock VerticalAlignment="Center"
-                                           ToolTip.Tip="{ext:Locale ToggleDiscordTooltip}"
-                                           Text="{ext:Locale SettingsTabGeneralEnableDiscordRichPresence}" />
-                                <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
-                             </StackPanel>
+                    <CheckBox IsChecked="{Binding EnableDiscordIntegration}">
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock VerticalAlignment="Center"
+                                       ToolTip.Tip="{ext:Locale ToggleDiscordTooltip}"
+                                       Text="{ext:Locale SettingsTabGeneralEnableDiscordRichPresence}" />
+                        </StackPanel>
                     </CheckBox>
                     <CheckBox 
                         IsEnabled="{Binding !IsGameTitleNotNull}"
diff --git a/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs b/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs
index bd145e048..8a0ddb560 100644
--- a/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs
+++ b/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs
@@ -21,12 +21,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
         public void Load(ConfigurationFileFormat cff, string configurationFilePath, string titleId = "")
         {
             bool configurationFileUpdated = false;
-            bool shouldLoadFromFile = true;
-
-            if (!string.IsNullOrEmpty(titleId))
-            {
-                shouldLoadFromFile = false;
-            }
+            bool shouldLoadFromFile = string.IsNullOrEmpty(titleId);
 
             if (cff.Version is < 0 or > ConfigurationFileFormat.CurrentVersion)
             {
@@ -50,7 +45,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
             }
             
           
-            EnableDiscordIntegration.Value = shouldLoadFromFile ? cff.EnableDiscordIntegration : EnableDiscordIntegration.Value; // Get from global config only
+            EnableDiscordIntegration.Value = cff.EnableDiscordIntegration;
             CheckUpdatesOnStart.Value = shouldLoadFromFile ? cff.CheckUpdatesOnStart : CheckUpdatesOnStart.Value; // Get from global config only
             UpdateCheckerType.Value = shouldLoadFromFile ? cff.UpdateCheckerType : UpdateCheckerType.Value; // Get from global config only
             FocusLostActionType.Value = cff.FocusLostActionType;