UI: Reset RPC state when AppHost stops

dexsage · Oct 19, 2024 · 2facad4 · 2facad4
1 parent 741eba2
commit 2facad4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/Ryujinx.UI.Common/DiscordIntegrationModule.cs b/src/Ryujinx.UI.Common/DiscordIntegrationModule.cs
@@ -86,6 +86,8 @@ public static void SwitchToPlayingState(ApplicationMetadata appMeta, ProcessResu
             });
         }
 
+        public static void SwitchToMainState() => _discordClient?.SetPresence(_discordPresenceMain);
+
         private static string TruncateToByteLength(string input)
         {
             if (Encoding.UTF8.GetByteCount(input) <= ApplicationByteLimit)

diff --git a/src/Ryujinx/AppHost.cs b/src/Ryujinx/AppHost.cs
@@ -498,6 +498,7 @@ public void ToggleVSync()
         public void Stop()
         {
             _isActive = false;
+            DiscordIntegrationModule.SwitchToMainState();
         }
 
         private void Exit()
@@ -511,6 +512,7 @@ private void Exit()
 
             _isStopped = true;
             _isActive = false;
+            DiscordIntegrationModule.SwitchToMainState();
         }
 
         public void DisposeContext()
@@ -962,10 +964,10 @@ private void RenderLoop()
             {
                 if (_viewModel.StartGamesInFullscreen)
                 {
-                    _viewModel.WindowState = WindowState.FullScreen;
+                    _viewModel.WindowState = MainWindow.FullScreenWindowState;
                 }
 
-                if (_viewModel.WindowState == WindowState.FullScreen)
+                if (_viewModel.WindowState == MainWindow.FullScreenWindowState)
                 {
                     _viewModel.ShowMenuAndStatusBar = false;
                 }
@@ -1136,7 +1138,7 @@ private bool UpdateFrame()
 
                 Dispatcher.UIThread.Post(() =>
                 {
-                    if (_keyboardInterface.GetKeyboardStateSnapshot().IsPressed(Key.Delete) && _viewModel.WindowState != WindowState.FullScreen)
+                    if (_keyboardInterface.GetKeyboardStateSnapshot().IsPressed(Key.Delete) && _viewModel.WindowState != MainWindow.FullScreenWindowState)
                     {
                         Device.Processes.ActiveApplication.DiskCacheLoadState?.Cancel();
                     }
-Original file line number
+Diff line change
@@ Expand Up @@
                 });
             }
+            public static void SwitchToMainState() => _discordClient?.SetPresence(_discordPresenceMain);
             private static string TruncateToByteLength(string input)
             {
                 if (Encoding.UTF8.GetByteCount(input) <= ApplicationByteLimit)
@@ Expand Down @@