Enable Rich Presence only after the activated region is set

might fix #402
CollapseLauncher · Mar 2, 2024 · 448ff77 · 448ff77
1 parent 58ca6d0
commit 448ff77
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/CollapseLauncher/Program.cs b/CollapseLauncher/Program.cs
@@ -69,8 +69,8 @@ public static void Main(params string[] args)
 
                 Process.GetCurrentProcess().PriorityBoostEnabled = true;
 
-                InitializeAppSettings();
                 ParseArguments(args);
+                InitializeAppSettings();
 
                 HttpLogInvoker.DownloadLog += HttpClientLogWatcher;
 
@@ -218,10 +218,6 @@ public static void InitializeAppSettings()
                 CurrentAppTheme = AppThemeMode.Dark;
                 LogWriteLine($"ThemeMode: {themeValue} is invalid! Falling back to Dark-mode (Valid values are: {string.Join(',', Enum.GetNames(typeof(AppThemeMode)))})", LogType.Warning, true);
             }
-#if !DISABLEDISCORD
-            bool isInitialStart = GetAppConfigValue("EnableDiscordRPC").ToBool();
-            AppDiscordPresence = new DiscordPresenceManager(isInitialStart);
-#endif
         }
 
         public static void RunElevateUpdate()

diff --git a/CollapseLauncher/XAMLs/MainApp/MainPage.xaml.cs b/CollapseLauncher/XAMLs/MainApp/MainPage.xaml.cs
@@ -2,6 +2,7 @@
 using CollapseLauncher.Pages;
 using CollapseLauncher.Statics;
 using Hi3Helper;
+using Hi3Helper.DiscordPresence;
 using Hi3Helper.Preset;
 using Hi3Helper.Shared.ClassStruct;
 using InnoSetupHelper;
@@ -153,9 +154,16 @@ private async Task InitializeStartup()
             {
                 LoadConfigV2();
                 SetActivatedRegion();
+
                 Page = typeof(HomePage);
             }
 
+#if !DISABLEDISCORD
+            bool isInitialStart = GetAppConfigValue("EnableDiscordRPC").ToBool();
+            AppDiscordPresence = new DiscordPresenceManager(isInitialStart);
+            AppDiscordPresence.SetActivity(ActivityType.Idle);
+#endif
+
             // Lock ChangeBtn for first start
             LockRegionChangeBtn = true;
 
@@ -1808,7 +1816,6 @@ private bool SetActivatedRegion()
                 return true;
 
             string oldGameCategory = GetAppConfigValue("GameCategory").ToString();
-            string oldGameRegion = GetAppConfigValue("GameRegion").ToString();
 
             string GameName = args.Game;
 
@@ -1834,6 +1841,10 @@ private bool SetActivatedRegion()
                     GameRegion = ConfigV2GameRegions[Region];
                 }
 
+                string oldGameRegion = ConfigV2GameRegions.ElementAt(GetPreviousGameRegion(GameName));
+                if (oldGameRegion == null)
+                    return true;
+
                 SetPreviousGameRegion(GameName, GameRegion);
                 SetAndSaveConfigValue("GameRegion", GameRegion);