UI: Prevent desynced RPC when toggling it off/on while in-game

Lets "Donkey Kong Country Returns HD" get into main gameplay.

Directory.Packages.props

@@ -3,13 +3,13 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Avalonia" Version="11.0.10" />
-    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.0.10" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.0.10" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.0.10" />
-    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.0.10" />
-    <PackageVersion Include="Avalonia.Svg" Version="11.0.0.18" />
-    <PackageVersion Include="Avalonia.Svg.Skia" Version="11.0.0.18" />
+    <PackageVersion Include="Avalonia" Version="11.0.13" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.0.13" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.0.13" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.0.13" />
+    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.0.13" />
+    <PackageVersion Include="Avalonia.Svg" Version="11.0.0.19" />
+    <PackageVersion Include="Avalonia.Svg.Skia" Version="11.0.0.19" />
     <PackageVersion Include="Microsoft.Build.Framework" Version="17.11.4" />
     <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.12.6" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
@@ -18,7 +18,7 @@
     <PackageVersion Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="9.4.0"/>
     <PackageVersion Include="CommandLineParser" Version="2.9.1" />
     <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0"/>
-    <PackageVersion Include="Concentus" Version="2.2.0" />
+    <PackageVersion Include="Concentus" Version="2.2.2" />
     <PackageVersion Include="DiscordRichPresence" Version="1.2.1.24" />
     <PackageVersion Include="DynamicData" Version="9.0.4" />
     <PackageVersion Include="FluentAvaloniaUI" Version="2.0.5" />
@@ -26,7 +26,7 @@
     <PackageVersion Include="LibHac" Version="0.19.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
-    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.1.2" />
+    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.3.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
     <PackageVersion Include="MsgPack.Cli" Version="1.0.1" />
@@ -48,11 +48,11 @@
     <PackageVersion Include="shaderc.net" Version="0.1.0" />
     <PackageVersion Include="SharpMetal" Version="1.0.0-preview21" />
     <PackageVersion Include="SharpZipLib" Version="1.4.2" />
-    <PackageVersion Include="Silk.NET.Vulkan" Version="2.21.0" />
-    <PackageVersion Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.21.0" />
-    <PackageVersion Include="Silk.NET.Vulkan.Extensions.KHR" Version="2.21.0" />
-    <PackageVersion Include="SkiaSharp" Version="2.88.7" />
-    <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.7" />
+    <PackageVersion Include="Silk.NET.Vulkan" Version="2.22.0" />
+    <PackageVersion Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.22.0" />
+    <PackageVersion Include="Silk.NET.Vulkan.Extensions.KHR" Version="2.22.0" />
+    <PackageVersion Include="SkiaSharp" Version="2.88.9" />
+    <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.9" />
     <PackageVersion Include="SPB" Version="0.0.4-build32" />
     <PackageVersion Include="System.IO.Hashing" Version="9.0.0" />
     <PackageVersion Include="System.Management" Version="9.0.0" />

src/Ryujinx.Common/RyujinxException.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace Ryujinx.Common
+{
+    public class RyujinxException : Exception
+    {
+        public RyujinxException(string message) : base(message)
+        { }
+    }
+}

src/Ryujinx.Graphics.Vulkan/Vendor.cs

@@ -92,7 +92,7 @@ namespace Ryujinx.Graphics.Vulkan
                 DriverId.MesaDozen => "Dozen",
                 DriverId.MesaNvk => "NVK",
                 DriverId.ImaginationOpenSourceMesa => "Imagination (Open)",
-                DriverId.MesaAgxv => "Honeykrisp",
+                DriverId.MesaHoneykrisp => "Honeykrisp",
                 _ => id.ToString(),
             };
         }

src/Ryujinx.HLE/HOS/Services/Hid/IHidServer.cs

@@ -702,6 +702,18 @@ namespace Ryujinx.HLE.HOS.Services.Hid
 
             return ResultCode.Success;
         }
+        
+        [CommandCmif(92)]
+        // SetGestureOutputRanges(pid, ushort Unknown0)
+        public ResultCode SetGestureOutputRanges(ServiceCtx context)
+        {
+            ulong pid = context.Request.HandleDesc.PId;
+            ushort unknown0 = context.RequestData.ReadUInt16();
+
+            Logger.Stub?.PrintStub(LogClass.ServiceHid, new { pid, unknown0 });
+
+            return ResultCode.Success;
+        }
 
         [CommandCmif(100)]
         // SetSupportedNpadStyleSet(pid, nn::applet::AppletResourceUserId, nn::hid::NpadStyleTag)

src/Ryujinx.HLE/Loaders/Processes/ProcessLoader.cs

@@ -26,7 +26,17 @@ namespace Ryujinx.HLE.Loaders.Processes
 
         private ulong _latestPid;
 
-        public ProcessResult ActiveApplication => _processesByPid[_latestPid];
+        public ProcessResult ActiveApplication
+        {
+            get
+            {
+                if (!_processesByPid.TryGetValue(_latestPid, out ProcessResult value))
+                    throw new RyujinxException(
+                        $"The HLE Process map did not have a process with ID {_latestPid}. Are you missing firmware?");
+                
+                return value;
+            }
+        }
 
         public ProcessLoader(Switch device)
         {

src/Ryujinx.Input.SDL2/SDL2Gamepad.cs

@@ -253,23 +253,11 @@ namespace Ryujinx.Input.SDL2
             return IGamepad.GetStateSnapshot(this);
         }
 
-        private static bool hotButtonMinus = false;
-        private static bool hotExit = false;
-
-        public bool SpecialExit()
-        {
-            if (hotButtonMinus)
-            {
-                hotButtonMinus = false;
-                return hotExit;
-            }
-            return hotExit = false;
-        }
-
         public GamepadStateSnapshot GetMappedStateSnapshot()
         {
             GamepadStateSnapshot rawState = GetStateSnapshot();
             GamepadStateSnapshot result = default;
+
             lock (_userMappingLock)
             {
                 if (_buttonsUserMapping.Count == 0)
@@ -282,28 +270,6 @@ namespace Ryujinx.Input.SDL2
                     if (!entry.IsValid)
                         continue;
 
-                    if (GamepadButtonInputId.Minus == entry.To)
-                    {                      
-                        if (rawState.IsPressed(entry.From) && !hotButtonMinus)
-                        {
-                            hotButtonMinus = true;
-                        }
-                        else if (!result.IsPressed(entry.From) && hotButtonMinus)
-                        {
-                            hotButtonMinus = false;
-                        }
-                    }
-
-                    if (GamepadButtonInputId.Plus == entry.To)
-                    {
-                        if (rawState.IsPressed(entry.To) && hotButtonMinus)
-                        {
-                          
-                           hotExit = true;
-                        }
-
-                    }
-
                     // Do not touch state of button already pressed
                     if (!result.IsPressed(entry.To))
                     {
@@ -410,7 +376,5 @@ namespace Ryujinx.Input.SDL2
 
             return SDL_GameControllerGetButton(_gamepadHandle, _buttonsDriverMapping[(int)inputId]) == 1;
         }
-
-
     }
 }

src/Ryujinx.Input.SDL2/SDL2Keyboard.cs

@@ -329,11 +329,6 @@ namespace Ryujinx.Input.SDL2
             return result;
         }
 
-        public bool SpecialExit()
-        {
-            return false;
-        }
-
         public GamepadStateSnapshot GetStateSnapshot()
         {
             throw new NotSupportedException();

src/Ryujinx.Input.SDL2/SDL2Mouse.cs

@@ -25,10 +25,6 @@ namespace Ryujinx.Input.SDL2
         {
             _driver = driver;
         }
-        public bool SpecialExit()
-        {
-            return false;
-        }
 
         public Vector2 GetPosition()
         {

src/Ryujinx.Input/HLE/NpadController.cs

@@ -3,7 +3,6 @@ using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Configuration.Hid.Controller;
 using Ryujinx.Common.Configuration.Hid.Controller.Motion;
 using Ryujinx.Common.Logging;
-using Ryujinx.Graphics.Gpu;
 using Ryujinx.HLE.HOS.Services.Hid;
 using System;
 using System.Collections.Concurrent;
@@ -274,21 +273,15 @@ namespace Ryujinx.Input.HLE
             }
         }
 
-        public bool Update()
+        public void Update()
         {
-            
             // _gamepad may be altered by other threads
             var gamepad = _gamepad;
-            
+
             if (gamepad != null && GamepadDriver != null)
             {
                 State = gamepad.GetMappedStateSnapshot();
 
-                if (gamepad.SpecialExit())
-                {
-                    return true;
-                }
-
                 if (_config is StandardControllerInputConfig controllerConfig && controllerConfig.Motion.EnableMotion)
                 {
                     if (controllerConfig.Motion.MotionBackend == MotionInputBackendType.GamepadDriver)
@@ -341,7 +334,6 @@ namespace Ryujinx.Input.HLE
                 State = default;
                 _leftMotionInput = null;
             }
-            return false;
         }
 
         public GamepadInput GetHLEInputState()

src/Ryujinx.Input/HLE/NpadManager.cs

@@ -200,10 +200,8 @@ namespace Ryujinx.Input.HLE
             ReloadConfiguration(inputConfig, enableKeyboard, enableMouse);
         }
 
-        public bool Update(float aspectRatio = 1)
+        public void Update(float aspectRatio = 1)
         {
-            bool specialExit = false;
-
             lock (_lock)
             {
                 List<GamepadInput> hleInputStates = new();
@@ -227,10 +225,9 @@ namespace Ryujinx.Input.HLE
                         DriverConfigurationUpdate(ref controller, inputConfig);
 
                         controller.UpdateUserConfiguration(inputConfig);
-
-                        specialExit = controller.Update();  //hotkey press check
+                        controller.Update();
                         controller.UpdateRumble(_device.Hid.Npads.GetRumbleQueue(playerIndex));
-                        
+
                         inputState = controller.GetHLEInputState();
 
                         inputState.Buttons |= _device.Hid.UpdateStickButtons(inputState.LStick, inputState.RStick);
@@ -318,8 +315,6 @@ namespace Ryujinx.Input.HLE
 
                 _device.TamperMachine.UpdateInput(hleInputStates);
             }
-
-            return specialExit;
         }
 
         internal InputConfig GetPlayerInputConfigByIndex(int index)

src/Ryujinx.Input/IGamepad.cs

@@ -79,12 +79,6 @@ namespace Ryujinx.Input
         /// <returns>A remapped snaphost of the state of the gamepad.</returns>
         GamepadStateSnapshot GetMappedStateSnapshot();
 
-        /// <summary>
-        /// Gets the state if the minus and plus buttons were pressed on the gamepad.
-        /// </summary>
-        /// <returns>returns true if the buttons were pressed.</returns>
-        bool SpecialExit();
-
         /// <summary>
         /// Get a snaphost of the state of the gamepad.
         /// </summary>

src/Ryujinx.UI.Common/Ryujinx.UI.Common.csproj

@@ -1,36 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Remove="Resources\Controller_JoyConLeft.svg" />
-    <None Remove="Resources\Controller_JoyConPair.svg" />
-    <None Remove="Resources\Controller_JoyConRight.svg" />
-    <None Remove="Resources\Controller_ProCon.svg" />
-    <None Remove="Resources\Icon_NCA.png" />
-    <None Remove="Resources\Icon_NRO.png" />
-    <None Remove="Resources\Icon_NSO.png" />
-    <None Remove="Resources\Icon_NSP.png" />
-    <None Remove="Resources\Icon_XCI.png" />
-    <None Remove="Resources\Logo_Amiibo.png" />
-    <None Remove="Resources\Logo_Discord.png" />
-    <None Remove="Resources\Logo_GitHub.png" />
-    <None Remove="Resources\Logo_Ryujinx.png" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="DiscordRichPresence" />
-    <PackageReference Include="DynamicData" />
-    <PackageReference Include="securifybv.ShellLink" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Ryujinx.Common\Ryujinx.Common.csproj" />
-    <ProjectReference Include="..\Ryujinx.HLE\Ryujinx.HLE.csproj" />
-    <ProjectReference Include="..\Ryujinx.Graphics.Vulkan\Ryujinx.Graphics.Vulkan.csproj" />
-  </ItemGroup>
-
-</Project>

src/Ryujinx/AppHost.cs

@@ -18,7 +18,6 @@ using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.UI.Renderer;
 using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ava.UI.Views.Main;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
 using Ryujinx.Ava.Utilities.AppLibrary;
@@ -71,7 +70,6 @@ namespace Ryujinx.Ava
         private const float MaxResolutionScale = 4.0f; // Max resolution hotkeys can scale to before wrapping.
         private const int TargetFps = 60;
         private const float VolumeDelta = 0.05f;
-        static bool SpecialExit = false;
 
         private static readonly Cursor _invisibleCursor = new(StandardCursorType.None);
         private readonly nint _invisibleCursorWin;
@@ -98,7 +96,6 @@ namespace Ryujinx.Ava
         private bool _isCursorInRenderer = true;
         private bool _ignoreCursorState = false;
 
-
         private enum CursorStates
         {
             CursorIsHidden,
@@ -506,13 +503,8 @@ namespace Ryujinx.Ava
             _viewModel.Volume = ConfigurationState.Instance.System.AudioVolume.Value;
 
             MainLoop();
-           
-            Exit();
-        }
 
-        public bool IsSpecialExit()
-        {
-            return SpecialExit;
+            Exit();
         }
 
         private void UpdateIgnoreMissingServicesState(object sender, ReactiveEventArgs<bool> args)
@@ -597,7 +589,6 @@ namespace Ryujinx.Ava
 
             _isStopped = true;
             Stop();
-            
         }
 
         public void DisposeContext()
@@ -1144,7 +1135,6 @@ namespace Ryujinx.Ava
             string dockedMode = ConfigurationState.Instance.System.EnableDockedMode ? LocaleManager.Instance[LocaleKeys.Docked] : LocaleManager.Instance[LocaleKeys.Handheld];
             string vSyncMode = Device.VSyncMode.ToString();
 
-
             UpdateShaderCount();
 
             if (GraphicsConfig.ResScale != 1)
@@ -1210,17 +1200,7 @@ namespace Ryujinx.Ava
                 return false;
             }
 
-            if (NpadManager.Update(ConfigurationState.Instance.Graphics.AspectRatio.Value.ToFloat()))
-            {
-                if (ConfigurationState.Instance.Hid.SpecialExitEmulator.Value == 1)
-                {
-                    SpecialExit = true; // close App
-                }
-                if (ConfigurationState.Instance.Hid.SpecialExitEmulator.Value > 0)
-                {
-                    _isActive = false; //close game
-                }
-            }
+            NpadManager.Update(ConfigurationState.Instance.Graphics.AspectRatio.Value.ToFloat());
 
             if (_viewModel.IsActive)
             {
@@ -1355,8 +1335,6 @@ namespace Ryujinx.Ava
 
             Device.Hid.DebugPad.Update();
 
-
-
             return true;
         }
 

src/Ryujinx/DiscordIntegrationModule.cs

@@ -1,4 +1,5 @@
 using DiscordRPC;
+using Gommon;
 using Humanizer;
 using Humanizer.Localisation;
 using Ryujinx.Ava.Utilities.AppLibrary;
@@ -75,11 +76,23 @@ namespace Ryujinx.Ava
                     _discordClient = new DiscordRpcClient(ApplicationId);
 
                     _discordClient.Initialize();
-                    _discordClient.SetPresence(_discordPresenceMain);
+
+                    Use(TitleIDs.CurrentApplication);
                 }
             }
         }
 
+        public static void Use(Optional<string> titleId)
+        {
+            if (titleId.TryGet(out string tid))
+                SwitchToPlayingState(
+                    ApplicationLibrary.LoadAndSaveMetaData(tid), 
+                    Switch.Shared.Processes.ActiveApplication
+                );
+            else 
+                SwitchToMainState();
+        }
+
         private static void SwitchToPlayingState(ApplicationMetadata appMeta, ProcessResult procRes)
         {
             _discordClient?.SetPresence(new RichPresence

src/Ryujinx/Headless/HeadlessRyujinx.cs

@@ -350,11 +350,11 @@ namespace Ryujinx.Headless
         {
             return options.GraphicsBackend switch
             {
-                GraphicsBackend.Vulkan => new VulkanWindow(_inputManager, options.LoggingGraphicsDebugLevel, options.AspectRatio, options.EnableMouse, options.HideCursorMode, options.IgnoreControllerApplet, options.SpecialExit),
+                GraphicsBackend.Vulkan => new VulkanWindow(_inputManager, options.LoggingGraphicsDebugLevel, options.AspectRatio, options.EnableMouse, options.HideCursorMode, options.IgnoreControllerApplet),
                 GraphicsBackend.Metal => OperatingSystem.IsMacOS() ?
-                    new MetalWindow(_inputManager, options.LoggingGraphicsDebugLevel, options.AspectRatio, options.EnableKeyboard, options.HideCursorMode, options.IgnoreControllerApplet, options.SpecialExit) :
+                    new MetalWindow(_inputManager, options.LoggingGraphicsDebugLevel, options.AspectRatio, options.EnableKeyboard, options.HideCursorMode, options.IgnoreControllerApplet) :
                     throw new Exception("Attempted to use Metal renderer on non-macOS platform!"),
-                _ => new OpenGLWindow(_inputManager, options.LoggingGraphicsDebugLevel, options.AspectRatio, options.EnableMouse, options.HideCursorMode, options.IgnoreControllerApplet, options.SpecialExit)
+                _ => new OpenGLWindow(_inputManager, options.LoggingGraphicsDebugLevel, options.AspectRatio, options.EnableMouse, options.HideCursorMode, options.IgnoreControllerApplet)
             };
         }
 

src/Ryujinx/Headless/Metal/MetalWindow.cs

@@ -23,9 +23,8 @@ namespace Ryujinx.Headless
             AspectRatio aspectRatio,
             bool enableMouse,
             HideCursorMode hideCursorMode, 
-            bool ignoreControllerApplet,
-            int specialExitEmulator)
-            : base(inputManager, glLogLevel, aspectRatio, enableMouse, hideCursorMode, ignoreControllerApplet, specialExitEmulator) { }
+            bool ignoreControllerApplet)
+            : base(inputManager, glLogLevel, aspectRatio, enableMouse, hideCursorMode, ignoreControllerApplet) { }
 
         public override SDL_WindowFlags GetWindowFlags() => SDL_WindowFlags.SDL_WINDOW_METAL;
 

src/Ryujinx/Headless/OpenGL/OpenGLWindow.cs

@@ -118,9 +118,8 @@ namespace Ryujinx.Headless
             AspectRatio aspectRatio,
             bool enableMouse,
             HideCursorMode hideCursorMode,
-            bool ignoreControllerApplet,
-            int specialExitEmulator)
-            : base(inputManager, glLogLevel, aspectRatio, enableMouse, hideCursorMode, ignoreControllerApplet, specialExitEmulator)
+            bool ignoreControllerApplet)
+            : base(inputManager, glLogLevel, aspectRatio, enableMouse, hideCursorMode, ignoreControllerApplet)
         {
             _glLogLevel = glLogLevel;
         }

src/Ryujinx/Headless/Options.cs

@@ -150,10 +150,7 @@ namespace Ryujinx.Headless
             
             if (NeedsOverride(nameof(IgnoreControllerApplet)))
                 IgnoreControllerApplet = configurationState.IgnoreApplet;
-
-            if (NeedsOverride(nameof(SpecialExit)))
-                SpecialExit = configurationState.Hid.SpecialExitEmulator;
-
+            
             return;
             
             bool NeedsOverride(string argKey) => originalArgs.None(arg => arg.TrimStart('-').EqualsIgnoreCase(OptionName(argKey)));
@@ -277,9 +274,6 @@ namespace Ryujinx.Headless
         [Option("enable-mouse", Required = false, Default = false, HelpText = "Enable or disable mouse support.")]
         public bool EnableMouse { get; set; }
 
-        [Option("enable-press-hotkeys-to-exit", Required = false, Default = 0, HelpText = "press the minus and plus buttons to: 0 -disable, 1 - exit app, 2 - exit game.")]
-        public int SpecialExit { get; set; }
-
         [Option("hide-cursor", Required = false, Default = HideCursorMode.OnIdle, HelpText = "Change when the cursor gets hidden.")]
         public HideCursorMode HideCursorMode { get; set; }
 
@@ -420,7 +414,6 @@ namespace Ryujinx.Headless
         [Option("ignore-controller-applet", Required = false, Default = false, HelpText = "Enable ignoring the controller applet when your game loses connection to your controller.")]
         public bool IgnoreControllerApplet { get; set; }
 
-
         // Values
 
         [Value(0, MetaName = "input", HelpText = "Input to load.", Required = true)]

src/Ryujinx/Headless/Vulkan/VulkanWindow.cs

@@ -18,9 +18,8 @@ namespace Ryujinx.Headless
             AspectRatio aspectRatio,
             bool enableMouse,
             HideCursorMode hideCursorMode,
-            bool ignoreControllerApplet,
-            int specialExitEmulator)
-            : base(inputManager, glLogLevel, aspectRatio, enableMouse, hideCursorMode, ignoreControllerApplet, specialExitEmulator)
+            bool ignoreControllerApplet)
+            : base(inputManager, glLogLevel, aspectRatio, enableMouse, hideCursorMode, ignoreControllerApplet)
         {
             _glLogLevel = glLogLevel;
         }

src/Ryujinx/Headless/WindowBase.cs

@@ -88,7 +88,6 @@ namespace Ryujinx.Headless
 
         private readonly AspectRatio _aspectRatio;
         private readonly bool _enableMouse;
-        private readonly int _specialExitEmulator;
         private readonly bool _ignoreControllerApplet;
 
         public WindowBase(
@@ -97,8 +96,7 @@ namespace Ryujinx.Headless
             AspectRatio aspectRatio,
             bool enableMouse,
             HideCursorMode hideCursorMode,
-            bool ignoreControllerApplet,
-            int specialExitEmulator)
+            bool ignoreControllerApplet)
         {
             MouseDriver = new SDL2MouseDriver(hideCursorMode);
             _inputManager = inputManager;
@@ -114,7 +112,6 @@ namespace Ryujinx.Headless
             _gpuDoneEvent = new ManualResetEvent(false);
             _aspectRatio = aspectRatio;
             _enableMouse = enableMouse;
-            _specialExitEmulator = specialExitEmulator;
             _ignoreControllerApplet = ignoreControllerApplet;
             HostUITheme = new HeadlessHostUiTheme();
 

src/Ryujinx/Input/AvaloniaKeyboard.cs

@@ -30,11 +30,6 @@ namespace Ryujinx.Ava.Input
             public readonly Key From = from;
         }
 
-        public bool SpecialExit()
-        {
-            return false;
-        }
-
         public AvaloniaKeyboard(AvaloniaKeyboardDriver driver, string id, string name)
         {
             _buttonsUserMapping = [];

src/Ryujinx/Input/AvaloniaMouse.cs

@@ -13,11 +13,6 @@ namespace Ryujinx.Ava.Input
         public string Id => "0";
         public string Name => "AvaloniaMouse";
 
-        public bool SpecialExit() 
-        {
-            return false;
-        }
-
         public bool IsConnected => true;
         public GamepadFeaturesFlag Features => throw new NotImplementedException();
         public bool[] Buttons => _driver.PressedButtons;

src/Ryujinx/Program.cs

@@ -21,6 +21,7 @@ using Ryujinx.Graphics.Vulkan.MoltenVK;
 using Ryujinx.Headless;
 using Ryujinx.SDL2.Common;
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
@@ -243,16 +244,33 @@ namespace Ryujinx.Ava
                     : $"Launch Mode: {AppDataManager.Mode}");
         }
 
-        internal static void ProcessUnhandledException(object sender, Exception ex, bool isTerminating)
+        internal static void ProcessUnhandledException(object sender, Exception initialException, bool isTerminating)
         {
             Logger.Log log = Logger.Error ?? Logger.Notice;
-            string message = $"Unhandled exception caught: {ex}";
 
-            // ReSharper disable once ConstantConditionalAccessQualifier
-            if (sender?.GetType()?.AsPrettyString() is { } senderName)
-                log.Print(LogClass.Application, message, senderName);
+            List<Exception> exceptions = [];
+
+            if (initialException is AggregateException ae)
+            {
+                exceptions.AddRange(ae.InnerExceptions);
+            }
             else
-                log.PrintMsg(LogClass.Application, message);
+            {
+                exceptions.Add(initialException);
+            }
+
+            foreach (var e in exceptions)
+            {
+                string message = $"Unhandled exception caught: {e}";
+                // ReSharper disable once ConstantConditionalAccessQualifier
+                if (sender?.GetType()?.AsPrettyString() is { } senderName)
+                    log.Print(LogClass.Application, message, senderName);
+                else
+                    log.PrintMsg(LogClass.Application, message);
+            }
+            
+
+
 
             if (isTerminating)
                 Exit();

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -1049,7 +1049,6 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         private void InitializeGame()
         {
-            
             RendererHostControl.WindowCreated += RendererHost_Created;
 
             AppHost.StatusUpdatedEvent += Update_StatusBar;
@@ -1059,13 +1058,7 @@ namespace Ryujinx.Ava.UI.ViewModels
 
             AppHost?.Start();
 
-            if (AppHost?.IsSpecialExit() == true)
-            {
-                Window.ForceExit();
-            }
-
             AppHost?.DisposeContext();
-
         }
 
         private async Task HandleRelaunch()

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -128,7 +128,6 @@ namespace Ryujinx.Ava.UI.ViewModels
         public bool EnableDockedMode { get; set; }
         public bool EnableKeyboard { get; set; }
         public bool EnableMouse { get; set; }
-        public int EnableSpecialExit { get; set; }
         public VSyncMode VSyncMode
         {
             get => _vSyncMode;
@@ -260,8 +259,6 @@ namespace Ryujinx.Ava.UI.ViewModels
         public int OpenglDebugLevel { get; set; }
         public int MemoryMode { get; set; }
         public int BaseStyleIndex { get; set; }
-
-       
         public int GraphicsBackendIndex
         {
             get => _graphicsBackendIndex;
@@ -514,13 +511,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             EnableDockedMode = config.System.EnableDockedMode;
             EnableKeyboard = config.Hid.EnableKeyboard;
             EnableMouse = config.Hid.EnableMouse;
-            EnableSpecialExit = config.Hid.SpecialExitEmulator.Value switch
-            {
-                0 => 0, // "Hotkey 'Exit' is Disabled"
-                1 => 1, // "Close app. by hotkey"
-                2 => 2, // "Close game by hotkey" 
-                _ => 0
-            };
 
             // Keyboard Hotkeys
             KeyboardHotkey = new HotkeyConfig(config.Hid.Hotkeys.Value);
@@ -628,13 +618,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             config.System.EnableDockedMode.Value = EnableDockedMode;
             config.Hid.EnableKeyboard.Value = EnableKeyboard;
             config.Hid.EnableMouse.Value = EnableMouse;
-            config.Hid.SpecialExitEmulator.Value = EnableSpecialExit switch
-            {
-                0 => 0, // "Hotkey 'Exit' is Disabled",
-                1 => 1, // "Close app. by hotkey",
-                2 => 2, // "Close game by hotkey",
-                _ => 0
-            };
 
             // Keyboard Hotkeys
             config.Hid.Hotkeys.Value = KeyboardHotkey.GetConfig();

src/Ryujinx/UI/Views/Settings/SettingsInputView.axaml

@@ -1,4 +1,4 @@
-<UserControl
+<UserControl
     x:Class="Ryujinx.Ava.UI.Views.Settings.SettingsInputView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -58,20 +58,6 @@
                                 <TextBlock
                                     Text="{ext:Locale SettingsTabInputDirectMouseAccess}" />
                             </CheckBox>
-                            <ComboBox SelectedIndex="{Binding EnableSpecialExit}"
-                                ToolTip.Tip="{ext:Locale SpecialExitTooltip}"
-                                HorizontalContentAlignment="Left"
-                                MinWidth="160">
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabInputDisableExitHotKey}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabInputHotkeyIsCloseApp}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{ext:Locale SettingsTabInputHotkeyIsCloseGame}" />
-                                </ComboBoxItem>
-                            </ComboBox>                           
                         </StackPanel>
                     </StackPanel>
                 </Grid>

src/Ryujinx/UI/Windows/MainWindow.axaml.cs

@@ -45,7 +45,6 @@ namespace Ryujinx.Ava.UI.Windows
         internal readonly AvaHostUIHandler UiHandler;
 
         private bool _isLoading;
-        private bool _isExitWithoutConfirm = false;
         private bool _applicationsLoadedOnce;
 
         private UserChannelPersistence _userChannelPersistence;
@@ -572,11 +571,11 @@ namespace Ryujinx.Ava.UI.Windows
 
         protected override void OnClosing(WindowClosingEventArgs e)
         {
-            if (!ViewModel.IsClosing && ViewModel.AppHost != null && ConfigurationState.Instance.ShowConfirmExit && !_isExitWithoutConfirm)
+            if (!ViewModel.IsClosing && ViewModel.AppHost != null && ConfigurationState.Instance.ShowConfirmExit)
             {
                 e.Cancel = true;
 
-                ConfirmExit(); 
+                ConfirmExit();
 
                 return;
             }
@@ -617,12 +616,6 @@ namespace Ryujinx.Ava.UI.Windows
             base.OnClosing(e);
         }
 
-        public void ForceExit() 
-        {
-            _isExitWithoutConfirm = true;
-             Close();
-        }
-
         private void ConfirmExit()
         {
             Dispatcher.UIThread.InvokeAsync(async () =>

src/Ryujinx/Utilities/Configuration/ConfigurationFileFormat.cs

@@ -17,7 +17,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
         /// <summary>
         /// The current version of the file format
         /// </summary>
-        public const int CurrentVersion = 60;
+        public const int CurrentVersion = 59;
 
         /// <summary>
         /// Version of the configuration file format
@@ -366,12 +366,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
         /// </summary>
         public bool EnableMouse { get; set; }
 
-        /// <summary>
-        /// Allows you to choose one of several behaviors when pressing hotkeys:
-        /// 0 - Do nothing, 1 - Close the emulator application, 2 - Exit the game.
-        /// </summary>
-        public int SpecialExitEmulator { get; set; }
-
         /// <summary>
         /// Hotkey Keyboard Bindings
         /// </summary>

src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs

@@ -136,7 +136,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
             
             Hid.EnableKeyboard.Value = cff.EnableKeyboard;
             Hid.EnableMouse.Value = cff.EnableMouse;
-            Hid.SpecialExitEmulator.Value = cff.SpecialExitEmulator;
             Hid.Hotkeys.Value = cff.Hotkeys;
             Hid.InputConfig.Value = cff.InputConfig ?? [];
 
@@ -415,10 +414,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
                     // This was accidentally enabled by default when it was PRed. That is not what we want,
                     // so as a compromise users who want to use it will simply need to re-enable it once after updating.
                     cff.IgnoreApplet = false;
-                }),
-                (60, static cff =>
-                {
-                    cff.SpecialExitEmulator = 0;
                 })
             );
     }

src/Ryujinx/Utilities/Configuration/ConfigurationState.Model.cs

@@ -420,13 +420,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
             /// </summary>
             public ReactiveObject<bool> EnableMouse { get; private set; }
 
-            /// <summary>
-            /// Allows you to choose one of several behaviors when pressing hotkeys:
-            /// 0 - Do nothing, 1 - Close the emulator application, 2 - Exit the game.
-            /// </summary>
-            public ReactiveObject<int> SpecialExitEmulator { get; private set; }
-
-
             /// <summary>
             /// Hotkey Keyboard Bindings
             /// </summary>
@@ -443,7 +436,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
             {
                 EnableKeyboard = new ReactiveObject<bool>();
                 EnableMouse = new ReactiveObject<bool>();
-                SpecialExitEmulator = new ReactiveObject<int>();
                 Hotkeys = new ReactiveObject<KeyboardHotkeys>();
                 InputConfig = new ReactiveObject<List<InputConfig>>();
             }

src/Ryujinx/Utilities/Configuration/ConfigurationState.cs

@@ -128,7 +128,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
                 ShowConsole = UI.ShowConsole,
                 EnableKeyboard = Hid.EnableKeyboard,
                 EnableMouse = Hid.EnableMouse,
-                SpecialExitEmulator = Hid.SpecialExitEmulator,
                 Hotkeys = Hid.Hotkeys,
                 KeyboardConfig = [],
                 ControllerConfig = [],
@@ -242,7 +241,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
             UI.WindowStartup.WindowMaximized.Value = false;
             Hid.EnableKeyboard.Value = false;
             Hid.EnableMouse.Value = false;
-            Hid.SpecialExitEmulator.Value = 0;
             Hid.Hotkeys.Value = new KeyboardHotkeys
             {
                 ToggleVSyncMode = Key.F1,