Merge branch 'master' into master

Added description in another file
oops, rename to"SpecialExitEmulator"
2025-01-11 22:54:24 +10:00 · 2025-01-11 22:37:33 +10:00 · 2025-01-11 22:27:28 +10:00 · 2025-01-11 22:20:08 +10:00 · 2025-01-11 21:26:51 +10:00 · 2025-01-10 21:16:31 -06:00
70 changed files with 4415 additions and 4810 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -22,7 +22,7 @@ body:
    id: log
    attributes:
      label: Log file
-      description: "A log file will help our developers to better diagnose and fix the issue. UPLOAD THE FILE. DO NOT COPY AND PASTE THE FILE'S CONTENT."
+      description: A log file will help our developers to better diagnose and fix the issue.
      placeholder: Logs files can be found under "Logs" folder in Ryujinx program folder. They can also be accessed by opening Ryujinx, then going to File > Open Logs Folder. You can drag and drop the log on to the text area (do not copy paste).
    validations:
      required: true
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -129,11 +129,11 @@ jobs:
        with:
          global-json-file: global.json

-      - name: Setup LLVM 17
+      - name: Setup LLVM 14
        run: |
          wget https://apt.llvm.org/llvm.sh
          chmod +x llvm.sh
-          sudo ./llvm.sh 17
+          sudo ./llvm.sh 14

      - name: Install rcodesign
        run: |
--- a/.github/workflows/canary.yml
+++ b/.github/workflows/canary.yml
@@ -210,11 +210,11 @@ jobs:
        with:
          global-json-file: global.json

-      - name: Setup LLVM 17
+      - name: Setup LLVM 15
        run: |
          wget https://apt.llvm.org/llvm.sh
          chmod +x llvm.sh
-          sudo ./llvm.sh 17
+          sudo ./llvm.sh 15

      - name: Install rcodesign
        run: |
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -191,11 +191,11 @@ jobs:
        with:
          global-json-file: global.json

-      - name: Setup LLVM 17
+      - name: Setup LLVM 15
        run: |
          wget https://apt.llvm.org/llvm.sh
          chmod +x llvm.sh
-          sudo ./llvm.sh 17
+          sudo ./llvm.sh 15

      - name: Install rcodesign
        run: |
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -3,13 +3,13 @@
    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
  </PropertyGroup>
  <ItemGroup>
-    <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="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="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.2" />
+    <PackageVersion Include="Concentus" Version="2.2.0" />
    <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.3.0" />
+    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.1.2" />
    <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.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="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="SPB" Version="0.0.4-build32" />
    <PackageVersion Include="System.IO.Hashing" Version="9.0.0" />
    <PackageVersion Include="System.Management" Version="9.0.0" />
--- a/distribution/macos/bundle_fix_up.py
+++ b/distribution/macos/bundle_fix_up.py
@@ -19,7 +19,7 @@ if platform.system() == "Darwin":
 else:
    OTOOL = shutil.which("llvm-otool")
    if OTOOL is None:
-        for llvm_ver in [17, 16, 15, 14, 13]:
+        for llvm_ver in [15, 14, 13]:
            otool_path = shutil.which(f"llvm-otool-{llvm_ver}")
            if otool_path is not None:
                OTOOL = otool_path
--- a/distribution/macos/construct_universal_dylib.py
+++ b/distribution/macos/construct_universal_dylib.py
@@ -26,7 +26,7 @@ else:
    LIPO = shutil.which("llvm-lipo")

    if LIPO is None:
-        for llvm_ver in [17, 16, 15, 14, 13]:
+        for llvm_ver in [15, 14, 13]:
            lipo_path = shutil.which(f"llvm-lipo-{llvm_ver}")
            if lipo_path is not None:
                LIPO = lipo_path
--- a/distribution/macos/create_macos_build_ava.sh
+++ b/distribution/macos/create_macos_build_ava.sh
@@ -67,11 +67,11 @@ python3 "$BASE_DIR/distribution/macos/construct_universal_dylib.py" "$ARM64_APP_

 if ! [ -x "$(command -v lipo)" ];
 then
-    if ! [ -x "$(command -v llvm-lipo-17)" ];
+    if ! [ -x "$(command -v llvm-lipo-14)" ];
    then
        LIPO=llvm-lipo
    else
-        LIPO=llvm-lipo-17
+        LIPO=llvm-lipo-14
    fi
 else
    LIPO=lipo
--- a/distribution/macos/create_macos_build_headless.sh
+++ b/distribution/macos/create_macos_build_headless.sh
@@ -62,11 +62,11 @@ python3 "$BASE_DIR/distribution/macos/construct_universal_dylib.py" "$ARM64_OUTP

 if ! [ -x "$(command -v lipo)" ];
 then
-    if ! [ -x "$(command -v llvm-lipo-17)" ];
+    if ! [ -x "$(command -v llvm-lipo-14)" ];
    then
        LIPO=llvm-lipo
    else
-        LIPO=llvm-lipo-17
+        LIPO=llvm-lipo-14
    fi
 else
    LIPO=lipo
--- a/distribution/macos/shortcut-template.plist
+++ b/distribution/macos/shortcut-template.plist
@@ -19,7 +19,7 @@
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2018 - 2025 Ryujinx Team and Contributors.</string>
+	<string>Copyright © 2018 - 2023 Ryujinx Team and Contributors.</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.games</string>
 	<key>LSMinimumSystemVersion</key>
--- a/docs/compatibility.csv
+++ b/docs/compatibility.csv
--- a/src/Ryujinx.Common/RyujinxException.cs
+++ b/src/Ryujinx.Common/RyujinxException.cs
@@ -1,10 +0,0 @@
-using System;
-
-namespace Ryujinx.Common
-{
-    public class RyujinxException : Exception
-    {
-        public RyujinxException(string message) : base(message)
-        { }
-    }
-}
--- a/src/Ryujinx.Common/TitleIDs.cs
+++ b/src/Ryujinx.Common/TitleIDs.cs
@@ -1,4 +1,4 @@
-using Gommon;
+using Gommon;
 using Ryujinx.Common.Configuration;
 using System;
 using System.Linq;
@@ -47,9 +47,6 @@ namespace Ryujinx.Common

        public static readonly string[] DiscordGameAssetKeys =
        [
-            "010008900705c000", // Dragon Quest Builders
-            "010042000a986000", // Dragon Quest Builders 2
-            
            "010055d009f78000", // Fire Emblem: Three Houses
            "0100a12011cc8000", // Fire Emblem: Shadow Dragon
            "0100a6301214e000", // Fire Emblem Engage
@@ -108,18 +105,17 @@ namespace Ryujinx.Common
            "0100f4c009322000", // Pikmin 3 Deluxe
            "0100b7c00933a000", // Pikmin 4

-            "0100f4300bf2c000", // New Pokémon Snap
-            "0100000011d90000", // Pokémon Brilliant Diamond
-            "01001f5010dfa000", // Pokémon Legends: Arceus
            "010003f003a34000", // Pokémon: Let's Go Pikachu!
            "0100187003a36000", // Pokémon: Let's Go Eevee!
-            "01003d200baa2000", // Pokémon Mystery Dungeon - Rescue Team DX
-            "0100a3d008c5c000", // Pokémon Scarlet
-            "01008db008c2c000", // Pokémon Shield
-            "010018e011d92000", // Pokémon Shining Pearl
            "0100abf008968000", // Pokémon Sword
+            "01008db008c2c000", // Pokémon Shield
+            "0100000011d90000", // Pokémon Brilliant Diamond
+            "010018e011d92000", // Pokémon Shining Pearl
+            "01001f5010dfa000", // Pokémon Legends: Arceus
+            "0100a3d008c5c000", // Pokémon Scarlet
            "01008f6008c5e000", // Pokémon Violet
            "0100b3f000be2000", // Pokkén Tournament DX
+            "0100f4300bf2c000", // New Pokémon Snap

            "01003bc0000a0000", // Splatoon 2 (US)
            "0100f8f0000a2000", // Splatoon 2 (EU)
@@ -169,21 +165,13 @@ namespace Ryujinx.Common
            "01005ea01c0fc000", // SONIC X SHADOW GENERATIONS
            "01005ea01c0fc001", // ^

-            "0100ff500e34a000", // Xenoblade Chronicles - Definitive Edition
-            "0100e95004038000", // Xenoblade Chronicles 2
-            "010074f013262000", // Xenoblade Chronicles 3
-
            "010056e00853a000", // A Hat in Time
-            "0100fd1014726000", // Baldurs Gate: Dark Alliance
            "0100dbf01000a000", // Burnout Paradise Remastered
            "0100744001588000", // Cars 3: Driven to Win
            "0100b41013c82000", // Cruis'n Blast
-            "010085900337e000", // Death Squared
            "01001b300b9be000", // Diablo III: Eternal Collection
            "01008c8012920000", // Dying Light Platinum Edition
            "01001cc01b2d4000", // Goat Simulator 3
-            "01003620068ea000", // Hand of Fate 2
-            "010085500130a000", // Lego City: Undercover
            "010073c01af34000", // LEGO Horizon Adventures
            "0100770008dd8000", // Monster Hunter Generations Ultimate
            "0100b04011742000", // Monster Hunter Rise
@@ -202,8 +190,6 @@ namespace Ryujinx.Common
            "01000a10041ea000", // The Elder Scrolls V: Skyrim
            "010057a01e4d4000", // TSUKIHIME -A piece of blue glass moon-
            "010080b00ad66000", // Undertale
-            "010069401adb8000", // Unicorn Overlord
-            "0100534009ff2000", // Yonder - The cloud catcher chronicles
        ];
    }
 }
--- a/src/Ryujinx.Graphics.Vulkan/Vendor.cs
+++ b/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.MesaHoneykrisp => "Honeykrisp",
+                DriverId.MesaAgxv => "Honeykrisp",
                _ => id.ToString(),
            };
        }
--- a/src/Ryujinx.HLE/HOS/Applets/PlayerSelect/PlayerSelectApplet.cs
+++ b/src/Ryujinx.HLE/HOS/Applets/PlayerSelect/PlayerSelectApplet.cs
@@ -26,20 +26,10 @@ namespace Ryujinx.HLE.HOS.Applets
        {
            _normalSession = normalSession;
            _interactiveSession = interactiveSession;
-            
-            UserProfile selected = _system.Device.UIHandler.ShowPlayerSelectDialog();
-            if (selected == null)
-            {
-                _normalSession.Push(BuildResponse());
-            }
-            else if (selected.UserId == new UserId("00000000000000000000000000000080"))
-            {
-                _normalSession.Push(BuildGuestResponse());
-            }
-            else
-            {
-                _normalSession.Push(BuildResponse(selected));
-            }
+
+            // TODO(jduncanator): Parse PlayerSelectConfig from input data
+            _normalSession.Push(BuildResponse());
+
            AppletStateChanged?.Invoke(this, null);

            _system.ReturnFocus();
@@ -47,34 +37,16 @@ namespace Ryujinx.HLE.HOS.Applets
            return ResultCode.Success;
        }

-        private byte[] BuildResponse(UserProfile selectedUser)
+        private byte[] BuildResponse()
        {
+            UserProfile currentUser = _system.AccountManager.LastOpenedUser;
+
            using MemoryStream stream = MemoryStreamManager.Shared.GetStream();
            using BinaryWriter writer = new(stream);

            writer.Write((ulong)PlayerSelectResult.Success);

-            selectedUser.UserId.Write(writer);
-
-            return stream.ToArray();
-        }
-        
-        private byte[] BuildGuestResponse()
-        {
-            using MemoryStream stream = MemoryStreamManager.Shared.GetStream();
-            using BinaryWriter writer = new(stream);
-            
-            writer.Write(new byte());
-
-            return stream.ToArray();
-        }
-        
-        private byte[] BuildResponse()
-        {
-            using MemoryStream stream = MemoryStreamManager.Shared.GetStream();
-            using BinaryWriter writer = new(stream);
-            
-            writer.Write((ulong)PlayerSelectResult.Failure);
+            currentUser.UserId.Write(writer);

            return stream.ToArray();
        }
--- a/src/Ryujinx.HLE/HOS/Kernel/Process/KProcessCapabilities.cs
+++ b/src/Ryujinx.HLE/HOS/Kernel/Process/KProcessCapabilities.cs
@@ -176,7 +176,9 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
                        AllowedCpuCoresMask = GetMaskFromMinMax(lowestCpuCore, highestCpuCore);
                        AllowedThreadPriosMask = GetMaskFromMinMax(lowestThreadPrio, highestThreadPrio);

-                        if (isApplication)
+                        if (isApplication && lowestCpuCore == 0 && highestCpuCore != 2)
+                            Ryujinx.Common.Logging.Logger.Error?.Print(Ryujinx.Common.Logging.LogClass.Application, $"Application requested cores with index range {lowestCpuCore} to {highestCpuCore}! Report this to @LotP on the Ryujinx/Ryubing discord server (discord.gg/ryujinx)!");
+                        else if (isApplication)
                            Ryujinx.Common.Logging.Logger.Info?.Print(Ryujinx.Common.Logging.LogClass.Application, $"Application requested cores with index range {lowestCpuCore} to {highestCpuCore}");

                        break;
--- a/src/Ryujinx.HLE/HOS/Services/Account/Acc/GuestUserImage.jpg
+++ b/src/Ryujinx.HLE/HOS/Services/Account/Acc/GuestUserImage.jpg
--- a/src/Ryujinx.HLE/HOS/Services/Hid/IHidServer.cs
+++ b/src/Ryujinx.HLE/HOS/Services/Hid/IHidServer.cs
@@ -702,18 +702,6 @@ 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)
--- a/src/Ryujinx.HLE/Loaders/Processes/ProcessLoader.cs
+++ b/src/Ryujinx.HLE/Loaders/Processes/ProcessLoader.cs
@@ -26,17 +26,7 @@ namespace Ryujinx.HLE.Loaders.Processes

        private ulong _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 ProcessResult ActiveApplication => _processesByPid[_latestPid];

        public ProcessLoader(Switch device)
        {
--- a/src/Ryujinx.HLE/Ryujinx.HLE.csproj
+++ b/src/Ryujinx.HLE/Ryujinx.HLE.csproj
@@ -48,7 +48,6 @@
    <EmbeddedResource Include="HOS\Applets\SoftwareKeyboard\Resources\Icon_BtnB.png" />
    <EmbeddedResource Include="HOS\Applets\SoftwareKeyboard\Resources\Icon_KeyF6.png" />
    <EmbeddedResource Include="HOS\Services\Account\Acc\DefaultUserImage.jpg" />
-    <EmbeddedResource Include="HOS\Services\Account\Acc\GuestUserImage.jpg" />
  </ItemGroup>

 </Project>
--- a/src/Ryujinx.HLE/UI/IHostUIHandler.cs
+++ b/src/Ryujinx.HLE/UI/IHostUIHandler.cs
@@ -1,5 +1,4 @@
 using Ryujinx.HLE.HOS.Applets;
-using Ryujinx.HLE.HOS.Services.Account.Acc;
 using Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.ApplicationProxy.Types;

 namespace Ryujinx.HLE.UI
@@ -60,11 +59,5 @@ namespace Ryujinx.HLE.UI
        /// Gets fonts and colors used by the host.
        /// </summary>
        IHostUITheme HostUITheme { get; }
-        
-        
-        /// <summary>
-        /// Displays the player select dialog and returns the selected profile.
-        /// </summary>
-        UserProfile ShowPlayerSelectDialog();
    }
 }
--- a/src/Ryujinx.Input.SDL2/SDL2Gamepad.cs
+++ b/src/Ryujinx.Input.SDL2/SDL2Gamepad.cs
@@ -253,11 +253,23 @@ 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)
@@ -270,6 +282,28 @@ 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))
                    {
@@ -376,5 +410,7 @@ namespace Ryujinx.Input.SDL2

            return SDL_GameControllerGetButton(_gamepadHandle, _buttonsDriverMapping[(int)inputId]) == 1;
        }
+
+
    }
 }
--- a/src/Ryujinx.Input.SDL2/SDL2Keyboard.cs
+++ b/src/Ryujinx.Input.SDL2/SDL2Keyboard.cs
@@ -329,6 +329,11 @@ namespace Ryujinx.Input.SDL2
            return result;
        }

+        public bool SpecialExit()
+        {
+            return false;
+        }
+
        public GamepadStateSnapshot GetStateSnapshot()
        {
            throw new NotSupportedException();
--- a/src/Ryujinx.Input.SDL2/SDL2Mouse.cs
+++ b/src/Ryujinx.Input.SDL2/SDL2Mouse.cs
@@ -25,6 +25,10 @@ namespace Ryujinx.Input.SDL2
        {
            _driver = driver;
        }
+        public bool SpecialExit()
+        {
+            return false;
+        }

        public Vector2 GetPosition()
        {
--- a/src/Ryujinx.Input/HLE/NpadController.cs
+++ b/src/Ryujinx.Input/HLE/NpadController.cs
@@ -3,6 +3,7 @@ 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;
@@ -273,15 +274,21 @@ namespace Ryujinx.Input.HLE
            }
        }

-        public void Update()
+        public bool 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)
@@ -334,6 +341,7 @@ namespace Ryujinx.Input.HLE
                State = default;
                _leftMotionInput = null;
            }
+            return false;
        }

        public GamepadInput GetHLEInputState()
--- a/src/Ryujinx.Input/HLE/NpadManager.cs
+++ b/src/Ryujinx.Input/HLE/NpadManager.cs
@@ -200,8 +200,10 @@ namespace Ryujinx.Input.HLE
            ReloadConfiguration(inputConfig, enableKeyboard, enableMouse);
        }

-        public void Update(float aspectRatio = 1)
+        public bool Update(float aspectRatio = 1)
        {
+            bool specialExit = false;
+
            lock (_lock)
            {
                List<GamepadInput> hleInputStates = new();
@@ -225,9 +227,10 @@ namespace Ryujinx.Input.HLE
                        DriverConfigurationUpdate(ref controller, inputConfig);

                        controller.UpdateUserConfiguration(inputConfig);
-                        controller.Update();
-                        controller.UpdateRumble(_device.Hid.Npads.GetRumbleQueue(playerIndex));

+                        specialExit = controller.Update();  //hotkey press check
+                        controller.UpdateRumble(_device.Hid.Npads.GetRumbleQueue(playerIndex));
+                        
                        inputState = controller.GetHLEInputState();

                        inputState.Buttons |= _device.Hid.UpdateStickButtons(inputState.LStick, inputState.RStick);
@@ -315,6 +318,8 @@ namespace Ryujinx.Input.HLE

                _device.TamperMachine.UpdateInput(hleInputStates);
            }
+
+            return specialExit;
        }

        internal InputConfig GetPlayerInputConfigByIndex(int index)
--- a/src/Ryujinx.Input/IGamepad.cs
+++ b/src/Ryujinx.Input/IGamepad.cs
@@ -79,6 +79,12 @@ 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>
--- a/src/Ryujinx.UI.Common/Ryujinx.UI.Common.csproj
+++ b/src/Ryujinx.UI.Common/Ryujinx.UI.Common.csproj
@@ -0,0 +1,36 @@
+<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>
--- a/src/Ryujinx/AppHost.cs
+++ b/src/Ryujinx/AppHost.cs
@@ -18,6 +18,7 @@ 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;
@@ -70,6 +71,7 @@ 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;
@@ -96,6 +98,7 @@ namespace Ryujinx.Ava
        private bool _isCursorInRenderer = true;
        private bool _ignoreCursorState = false;

+
        private enum CursorStates
        {
            CursorIsHidden,
@@ -489,7 +492,7 @@ namespace Ryujinx.Ava

            Dispatcher.UIThread.InvokeAsync(() =>
            {
-                _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowTitleBar);
+                _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device.Processes.ActiveApplication, Program.Version);
            });

            _viewModel.SetUiProgressHandlers(Device);
@@ -503,10 +506,15 @@ namespace Ryujinx.Ava
            _viewModel.Volume = ConfigurationState.Instance.System.AudioVolume.Value;

            MainLoop();
-
+           
            Exit();
        }

+        public bool IsSpecialExit()
+        {
+            return SpecialExit;
+        }
+
        private void UpdateIgnoreMissingServicesState(object sender, ReactiveEventArgs<bool> args)
        {
            if (Device != null)
@@ -589,6 +597,7 @@ namespace Ryujinx.Ava

            _isStopped = true;
            Stop();
+            
        }

        public void DisposeContext()
@@ -872,7 +881,7 @@ namespace Ryujinx.Ava
            Device?.System.TogglePauseEmulation(false);

            _viewModel.IsPaused = false;
-            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowTitleBar);
+            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version);
            Logger.Info?.Print(LogClass.Emulation, "Emulation was resumed");
        }

@@ -881,7 +890,7 @@ namespace Ryujinx.Ava
            Device?.System.TogglePauseEmulation(true);

            _viewModel.IsPaused = true;
-            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowTitleBar, LocaleManager.Instance[LocaleKeys.Paused]);
+            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, LocaleManager.Instance[LocaleKeys.Paused]);
            Logger.Info?.Print(LogClass.Emulation, "Emulation was paused");
        }

@@ -1135,6 +1144,7 @@ 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)
@@ -1200,7 +1210,17 @@ namespace Ryujinx.Ava
                return false;
            }

-            NpadManager.Update(ConfigurationState.Instance.Graphics.AspectRatio.Value.ToFloat());
+            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
+                }
+            }

            if (_viewModel.IsActive)
            {
@@ -1335,6 +1355,8 @@ namespace Ryujinx.Ava

            Device.Hid.DebugPad.Update();

+
+
            return true;
        }

--- a/src/Ryujinx/Assets/locales.json
+++ b/src/Ryujinx/Assets/locales.json
--- a/src/Ryujinx/Common/ApplicationHelper.cs
+++ b/src/Ryujinx/Common/ApplicationHelper.cs
@@ -295,143 +295,6 @@ namespace Ryujinx.Ava.Common
            };
            extractorThread.Start();
        }
-        
-        public static void ExtractAoc(string destination, NcaSectionType ncaSectionType, string updateFilePath, string updateName)
-        {
-            var cancellationToken = new CancellationTokenSource();
-
-            UpdateWaitWindow waitingDialog = new(
-                RyujinxApp.FormatTitle(LocaleKeys.DialogNcaExtractionTitle),
-                LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogNcaExtractionMessage, ncaSectionType, Path.GetFileName(updateFilePath)),
-                cancellationToken);
-
-            Thread extractorThread = new(() =>
-            {
-                Dispatcher.UIThread.Post(waitingDialog.Show);
-
-                using FileStream file = new(updateFilePath, FileMode.Open, FileAccess.Read);
-
-                Nca publicDataNca = null;
-
-                string extension = Path.GetExtension(updateFilePath).ToLower();
-                if (extension is ".nsp")
-                {
-                    var pfsTemp = new PartitionFileSystem();
-                    pfsTemp.Initialize(file.AsStorage()).ThrowIfFailure();
-                    IFileSystem pfs = pfsTemp;
-
-                    foreach (DirectoryEntryEx fileEntry in pfs.EnumerateEntries("/", "*.nca"))
-                    {
-                        using var ncaFile = new UniqueRef<IFile>();
-
-                        pfs.OpenFile(ref ncaFile.Ref, fileEntry.FullPath.ToU8Span(), OpenMode.Read).ThrowIfFailure();
-
-                        Nca nca = new(_virtualFileSystem.KeySet, ncaFile.Get.AsStorage());
-                        if (nca.Header.ContentType is NcaContentType.PublicData && nca.SectionExists(NcaSectionType.Data))
-                        {
-                            publicDataNca = nca;
-                        }
-                    }
-                }
-
-                if (publicDataNca is null)
-                {
-                    Logger.Error?.Print(LogClass.Application, "Extraction failure. The  NCA was not present in the selected file");
-
-                    Dispatcher.UIThread.InvokeAsync(async () =>
-                    {
-                        waitingDialog.Close();
-
-                        await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogNcaExtractionMainNcaNotFoundErrorMessage]);
-                    });
-
-                    return;
-                }
-
-                IntegrityCheckLevel checkLevel = ConfigurationState.Instance.System.EnableFsIntegrityChecks
-                    ? IntegrityCheckLevel.ErrorOnInvalid
-                    : IntegrityCheckLevel.None;
-
-                int index = Nca.GetSectionIndexFromType(ncaSectionType, publicDataNca.Header.ContentType);
-
-                try
-                {
-                    IFileSystem ncaFileSystem = publicDataNca.OpenFileSystem(index, IntegrityCheckLevel.ErrorOnInvalid);
-
-                    FileSystemClient fsClient = _horizonClient.Fs;
-
-                    string source = DateTime.Now.ToFileTime().ToString()[10..];
-                    string output = DateTime.Now.ToFileTime().ToString()[10..];
-
-                    using var uniqueSourceFs = new UniqueRef<IFileSystem>(ncaFileSystem);
-                    using var uniqueOutputFs = new UniqueRef<IFileSystem>(new LocalFileSystem(destination));
-
-                    fsClient.Register(source.ToU8Span(), ref uniqueSourceFs.Ref);
-                    fsClient.Register(output.ToU8Span(), ref uniqueOutputFs.Ref);
-
-                    (Result? resultCode, bool canceled) = CopyDirectory(fsClient, $"{source}:/", $"{output}:/", cancellationToken.Token);
-
-                    if (!canceled)
-                    {
-                        if (resultCode.Value.IsFailure())
-                        {
-                            Logger.Error?.Print(LogClass.Application, $"LibHac returned error code: {resultCode.Value.ErrorCode}");
-
-                            Dispatcher.UIThread.InvokeAsync(async () =>
-                            {
-                                waitingDialog.Close();
-
-                                await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogNcaExtractionCheckLogErrorMessage]);
-                            });
-                        }
-                        else if (resultCode.Value.IsSuccess())
-                        {
-                            Dispatcher.UIThread.Post(waitingDialog.Close);
-
-                            NotificationHelper.ShowInformation(
-                                RyujinxApp.FormatTitle(LocaleKeys.DialogNcaExtractionTitle),
-                                $"{updateName}\n\n{LocaleManager.Instance[LocaleKeys.DialogNcaExtractionSuccessMessage]}");
-                        }
-                    }
-
-                    fsClient.Unmount(source.ToU8Span());
-                    fsClient.Unmount(output.ToU8Span());
-                }
-                catch (ArgumentException ex)
-                {
-                    Logger.Error?.Print(LogClass.Application, $"{ex.Message}");
-
-                    Dispatcher.UIThread.InvokeAsync(async () =>
-                    {
-                        waitingDialog.Close();
-
-                        await ContentDialogHelper.CreateErrorDialog(ex.Message);
-                    });
-                }
-            })
-            {
-                Name = "GUI.NcaSectionExtractorThread",
-                IsBackground = true,
-            };
-            extractorThread.Start();
-        }
-
-        public static async Task ExtractAoc(IStorageProvider storageProvider, NcaSectionType ncaSectionType,
-            string updateFilePath, string updateName)
-        {
-            var result = await storageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions
-            {
-                Title = LocaleManager.Instance[LocaleKeys.FolderDialogExtractTitle],
-                AllowMultiple = false,
-            });
-
-            if (result.Count == 0)
-            {
-                return;
-            }
-
-            ExtractAoc(result[0].Path.LocalPath, ncaSectionType, updateFilePath, updateName);
-        }


        public static async Task ExtractSection(IStorageProvider storageProvider, NcaSectionType ncaSectionType, string titleFilePath, string titleName, int programIndex = 0)
--- a/src/Ryujinx/Common/ThemeManager.cs
+++ b/src/Ryujinx/Common/ThemeManager.cs
@@ -4,11 +4,11 @@ namespace Ryujinx.Ava.Common
 {
    public static class ThemeManager
    {
-        public static event Action ThemeChanged;
+        public static event EventHandler ThemeChanged;

        public static void OnThemeChanged()
        {
-            ThemeChanged?.Invoke();
+            ThemeChanged?.Invoke(null, EventArgs.Empty);
        }
    }
 }
--- a/src/Ryujinx/DiscordIntegrationModule.cs
+++ b/src/Ryujinx/DiscordIntegrationModule.cs
@@ -1,8 +1,6 @@
 using DiscordRPC;
-using Gommon;
 using Humanizer;
 using Humanizer.Localisation;
-using Ryujinx.Ava.Utilities;
 using Ryujinx.Ava.Utilities.AppLibrary;
 using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common;
@@ -47,7 +45,16 @@ namespace Ryujinx.Ava
            };

            ConfigurationState.Instance.EnableDiscordIntegration.Event += Update;
-            TitleIDs.CurrentApplication.Event += (_, e) => Use(e.NewValue);
+            TitleIDs.CurrentApplication.Event += (_, e) =>
+            {
+                if (e.NewValue)
+                    SwitchToPlayingState(
+                        ApplicationLibrary.LoadAndSaveMetaData(e.NewValue),
+                        Switch.Shared.Processes.ActiveApplication
+                    );
+                else 
+                    SwitchToMainState();
+            };
        }

        private static void Update(object sender, ReactiveEventArgs<bool> evnt)
@@ -68,23 +75,11 @@ namespace Ryujinx.Ava
                    _discordClient = new DiscordRpcClient(ApplicationId);

                    _discordClient.Initialize();
-
-                    Use(TitleIDs.CurrentApplication);
+                    _discordClient.SetPresence(_discordPresenceMain);
                }
            }
        }

-        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
@@ -98,7 +93,7 @@ namespace Ryujinx.Ava
                },
                Details = TruncateToByteLength($"Playing {appMeta.Title}"),
                State = appMeta.LastPlayed.HasValue && appMeta.TimePlayed.TotalSeconds > 5
-                    ? $"Total play time: {ValueFormatUtils.FormatTimeSpan(appMeta.TimePlayed)}"
+                    ? $"Total play time: {appMeta.TimePlayed.Humanize(2, false, maxUnit: TimeUnit.Hour)}"
                    : "Never played",
                Timestamps = Timestamps.Now
            });
--- a/src/Ryujinx/Headless/HeadlessRyujinx.cs
+++ b/src/Ryujinx/Headless/HeadlessRyujinx.cs
@@ -228,6 +228,8 @@ namespace Ryujinx.Headless
            _inputConfiguration ??= [];
            _enableKeyboard = option.EnableKeyboard;
            _enableMouse = option.EnableMouse;
+
+
            
            LoadPlayerConfiguration(option.InputProfile1Name, option.InputId1, PlayerIndex.Player1);
            LoadPlayerConfiguration(option.InputProfile2Name, option.InputId2, PlayerIndex.Player2); 
@@ -299,10 +301,7 @@ namespace Ryujinx.Headless
                _userChannelPersistence.ShouldRestart = false;
            }

-            try
-            {
-                _inputManager.Dispose();
-            } catch {}
+            _inputManager.Dispose();

            return;
            
@@ -339,23 +338,23 @@ namespace Ryujinx.Headless
        {
            string label = state switch
            {
-                LoadState => "PTC",
-                ShaderCacheState => "Shaders",
-                _ => throw new ArgumentException($"Unknown Progress Handler type {typeof(T)}")
+                LoadState => $"PTC : {current}/{total}",
+                ShaderCacheState => $"Shaders : {current}/{total}",
+                _ => throw new ArgumentException($"Unknown Progress Handler type {typeof(T)}"),
            };

-            Logger.Info?.Print(LogClass.Application, $"{label} : {current}/{total}");
+            Logger.Info?.Print(LogClass.Application, label);
        }

        private static WindowBase CreateWindow(Options options)
        {
            return options.GraphicsBackend switch
            {
-                GraphicsBackend.Vulkan => new VulkanWindow(_inputManager, options.LoggingGraphicsDebugLevel, options.AspectRatio, options.EnableMouse, options.HideCursorMode, options.IgnoreControllerApplet),
+                GraphicsBackend.Vulkan => new VulkanWindow(_inputManager, options.LoggingGraphicsDebugLevel, options.AspectRatio, options.EnableMouse, options.HideCursorMode, options.IgnoreControllerApplet, options.SpecialExit),
                GraphicsBackend.Metal => OperatingSystem.IsMacOS() ?
-                    new MetalWindow(_inputManager, options.LoggingGraphicsDebugLevel, options.AspectRatio, options.EnableKeyboard, options.HideCursorMode, options.IgnoreControllerApplet) :
+                    new MetalWindow(_inputManager, options.LoggingGraphicsDebugLevel, options.AspectRatio, options.EnableKeyboard, options.HideCursorMode, options.IgnoreControllerApplet, options.SpecialExit) :
                    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)
+                _ => new OpenGLWindow(_inputManager, options.LoggingGraphicsDebugLevel, options.AspectRatio, options.EnableMouse, options.HideCursorMode, options.IgnoreControllerApplet, options.SpecialExit)
            };
        }

--- a/src/Ryujinx/Headless/Windows/MetalWindow.cs
+++ b/src/Ryujinx/Headless/Windows/MetalWindow.cs
@@ -23,10 +23,11 @@ namespace Ryujinx.Headless
            AspectRatio aspectRatio,
            bool enableMouse,
            HideCursorMode hideCursorMode, 
-            bool ignoreControllerApplet)
-            : base(inputManager, glLogLevel, aspectRatio, enableMouse, hideCursorMode, ignoreControllerApplet) { }
+            bool ignoreControllerApplet,
+            int specialExitEmulator)
+            : base(inputManager, glLogLevel, aspectRatio, enableMouse, hideCursorMode, ignoreControllerApplet, specialExitEmulator) { }

-        public override SDL_WindowFlags WindowFlags => SDL_WindowFlags.SDL_WINDOW_METAL;
+        public override SDL_WindowFlags GetWindowFlags() => SDL_WindowFlags.SDL_WINDOW_METAL;

        protected override void InitializeWindowRenderer()
        {
--- a/src/Ryujinx/Headless/Windows/OpenGLWindow.cs
+++ b/src/Ryujinx/Headless/Windows/OpenGLWindow.cs
@@ -108,7 +108,8 @@ namespace Ryujinx.Headless
                }
            }
        }
-        
+
+        private readonly GraphicsDebugLevel _glLogLevel;
        private SDL2OpenGLContext _openGLContext;

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

-        public override SDL_WindowFlags WindowFlags => SDL_WindowFlags.SDL_WINDOW_OPENGL;
+        public override SDL_WindowFlags GetWindowFlags() => SDL_WindowFlags.SDL_WINDOW_OPENGL;

        protected override void InitializeWindowRenderer()
        {
            // Ensure to not share this context with other contexts before this point.
-            SetupOpenGLAttributes(false, GlLogLevel);
+            SetupOpenGLAttributes(false, _glLogLevel);
            nint context = SDL_GL_CreateContext(WindowHandle);
            CheckResult(SDL_GL_SetSwapInterval(1));

--- a/src/Ryujinx/Headless/Options.cs
+++ b/src/Ryujinx/Headless/Options.cs
@@ -150,7 +150,10 @@ 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)));
@@ -274,6 +277,9 @@ 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; }

@@ -414,6 +420,7 @@ 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)]
--- a/src/Ryujinx/Headless/Ryujinx.bmp
+++ b/src/Ryujinx/Headless/Ryujinx.bmp
--- a/src/Ryujinx/Headless/StatusUpdatedEventArgs.cs
+++ b/src/Ryujinx/Headless/StatusUpdatedEventArgs.cs
@@ -0,0 +1,21 @@
+using System;
+
+namespace Ryujinx.Headless
+{
+    class StatusUpdatedEventArgs(
+        string vSyncMode,
+        string dockedMode,
+        string aspectRatio,
+        string gameStatus,
+        string fifoStatus,
+        string gpuName)
+        : EventArgs
+    {
+        public string VSyncMode = vSyncMode;
+        public string DockedMode = dockedMode;
+        public string AspectRatio = aspectRatio;
+        public string GameStatus = gameStatus;
+        public string FifoStatus = fifoStatus;
+        public string GpuName = gpuName;
+    }
+}
--- a/src/Ryujinx/Headless/Windows/VulkanWindow.cs
+++ b/src/Ryujinx/Headless/Windows/VulkanWindow.cs
@@ -10,18 +10,22 @@ namespace Ryujinx.Headless
 {
    class VulkanWindow : WindowBase
    {
+        private readonly GraphicsDebugLevel _glLogLevel;
+
        public VulkanWindow(
            InputManager inputManager,
            GraphicsDebugLevel glLogLevel,
            AspectRatio aspectRatio,
            bool enableMouse,
            HideCursorMode hideCursorMode,
-            bool ignoreControllerApplet)
-            : base(inputManager, glLogLevel, aspectRatio, enableMouse, hideCursorMode, ignoreControllerApplet)
+            bool ignoreControllerApplet,
+            int specialExitEmulator)
+            : base(inputManager, glLogLevel, aspectRatio, enableMouse, hideCursorMode, ignoreControllerApplet, specialExitEmulator)
        {
+            _glLogLevel = glLogLevel;
        }

-        public override SDL_WindowFlags WindowFlags => SDL_WindowFlags.SDL_WINDOW_VULKAN;
+        public override SDL_WindowFlags GetWindowFlags() => SDL_WindowFlags.SDL_WINDOW_VULKAN;

        protected override void InitializeWindowRenderer() { }

--- a/src/Ryujinx/Headless/Windows/WindowBase.cs
+++ b/src/Ryujinx/Headless/Windows/WindowBase.cs
@@ -1,15 +1,14 @@
 using Humanizer;
+using LibHac.Tools.Fs;
 using Ryujinx.Ava;
-using Ryujinx.Ava.UI.Models;
-using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Logging;
 using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.GAL.Multithreading;
+using Ryujinx.Graphics.Gpu;
 using Ryujinx.Graphics.OpenGL;
 using Ryujinx.HLE.HOS.Applets;
-using Ryujinx.HLE.HOS.Services.Account.Acc;
 using Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.ApplicationProxy.Types;
 using Ryujinx.HLE.UI;
 using Ryujinx.Input;
@@ -27,7 +26,6 @@ using static SDL2.SDL;
 using AntiAliasing = Ryujinx.Common.Configuration.AntiAliasing;
 using ScalingFilter = Ryujinx.Common.Configuration.ScalingFilter;
 using Switch = Ryujinx.HLE.Switch;
-using UserProfile = Ryujinx.HLE.HOS.Services.Account.Acc.UserProfile;

 namespace Ryujinx.Headless
 {
@@ -55,6 +53,8 @@ namespace Ryujinx.Headless
        public Switch Device { get; private set; }
        public IRenderer Renderer { get; private set; }

+        public event EventHandler<StatusUpdatedEventArgs> StatusUpdatedEvent;
+
        protected nint WindowHandle { get; set; }

        public IHostUITheme HostUITheme { get; }
@@ -72,7 +72,7 @@ namespace Ryujinx.Headless
        protected SDL2MouseDriver MouseDriver;
        private readonly InputManager _inputManager;
        private readonly IKeyboard _keyboardInterface;
-        protected readonly GraphicsDebugLevel GlLogLevel;
+        private readonly GraphicsDebugLevel _glLogLevel;
        private readonly Stopwatch _chrono;
        private readonly long _ticksPerFrame;
        private readonly CancellationTokenSource _gpuCancellationTokenSource;
@@ -88,6 +88,7 @@ namespace Ryujinx.Headless

        private readonly AspectRatio _aspectRatio;
        private readonly bool _enableMouse;
+        private readonly int _specialExitEmulator;
        private readonly bool _ignoreControllerApplet;

        public WindowBase(
@@ -96,7 +97,8 @@ namespace Ryujinx.Headless
            AspectRatio aspectRatio,
            bool enableMouse,
            HideCursorMode hideCursorMode,
-            bool ignoreControllerApplet)
+            bool ignoreControllerApplet,
+            int specialExitEmulator)
        {
            MouseDriver = new SDL2MouseDriver(hideCursorMode);
            _inputManager = inputManager;
@@ -104,7 +106,7 @@ namespace Ryujinx.Headless
            NpadManager = _inputManager.CreateNpadManager();
            TouchScreenManager = _inputManager.CreateTouchScreenManager();
            _keyboardInterface = (IKeyboard)_inputManager.KeyboardDriver.GetGamepad("0");
-            GlLogLevel = glLogLevel;
+            _glLogLevel = glLogLevel;
            _chrono = new Stopwatch();
            _ticksPerFrame = Stopwatch.Frequency / TargetFps;
            _gpuCancellationTokenSource = new CancellationTokenSource();
@@ -112,6 +114,7 @@ namespace Ryujinx.Headless
            _gpuDoneEvent = new ManualResetEvent(false);
            _aspectRatio = aspectRatio;
            _enableMouse = enableMouse;
+            _specialExitEmulator = specialExitEmulator;
            _ignoreControllerApplet = ignoreControllerApplet;
            HostUITheme = new HeadlessHostUiTheme();

@@ -137,7 +140,7 @@ namespace Ryujinx.Headless

        private void SetWindowIcon()
        {
-            Stream iconStream = EmbeddedResources.GetStream("Ryujinx/Assets/UIImages/Logo_Ryujinx.png");
+            Stream iconStream = typeof(Program).Assembly.GetManifestResourceStream("HeadlessLogo");
            byte[] iconBytes = new byte[iconStream!.Length];

            if (iconStream.Read(iconBytes, 0, iconBytes.Length) != iconBytes.Length)
@@ -191,7 +194,7 @@ namespace Ryujinx.Headless
                FullscreenFlag = SDL_WindowFlags.SDL_WINDOW_FULLSCREEN_DESKTOP;
            }

-            WindowHandle = SDL_CreateWindow($"Ryujinx {Program.Version}{titleNameSection}{titleVersionSection}{titleIdSection}{titleArchSection}", SDL_WINDOWPOS_CENTERED_DISPLAY(DisplayId), SDL_WINDOWPOS_CENTERED_DISPLAY(DisplayId), Width, Height, DefaultFlags | FullscreenFlag | WindowFlags);
+            WindowHandle = SDL_CreateWindow($"Ryujinx {Program.Version}{titleNameSection}{titleVersionSection}{titleIdSection}{titleArchSection}", SDL_WINDOWPOS_CENTERED_DISPLAY(DisplayId), SDL_WINDOWPOS_CENTERED_DISPLAY(DisplayId), Width, Height, DefaultFlags | FullscreenFlag | GetWindowFlags());

            if (WindowHandle == nint.Zero)
            {
@@ -246,7 +249,7 @@ namespace Ryujinx.Headless

        protected abstract void SwapBuffers();

-        public abstract SDL_WindowFlags WindowFlags { get; }
+        public abstract SDL_WindowFlags GetWindowFlags();

        private string GetGpuDriverName()
        {
@@ -268,7 +271,7 @@ namespace Ryujinx.Headless
        {
            InitializeWindowRenderer();

-            Device.Gpu.Renderer.Initialize(GlLogLevel);
+            Device.Gpu.Renderer.Initialize(_glLogLevel);

            InitializeRenderer();

@@ -308,6 +311,21 @@ namespace Ryujinx.Headless

                    if (_ticks >= _ticksPerFrame)
                    {
+                        string dockedMode = Device.System.State.DockedMode ? "Docked" : "Handheld";
+                        float scale = GraphicsConfig.ResScale;
+                        if (scale != 1)
+                        {
+                            dockedMode += $" ({scale}x)";
+                        }
+
+                        StatusUpdatedEvent?.Invoke(this, new StatusUpdatedEventArgs(
+                            Device.VSyncMode.ToString(),
+                            dockedMode,
+                            Device.Configuration.AspectRatio.ToText(),
+                            $"{Device.Statistics.GetGameFrameRate():00.00} FPS ({Device.Statistics.GetGameFrameTime():00.00} ms)",
+                            $"FIFO: {Device.Statistics.GetFifoPercent():0.00} %",
+                            $"GPU: {_gpuDriverName}"));
+
                        _ticks = Math.Min(_ticks - _ticksPerFrame, _ticksPerFrame);
                    }
                }
@@ -557,10 +575,5 @@ namespace Ryujinx.Headless
                SDL2Driver.Instance.Dispose();
            }
        }
-        
-        public UserProfile ShowPlayerSelectDialog()
-        {
-            return AccountSaveDataManager.GetLastUsedUser();
-        }
    }
 }
--- a/src/Ryujinx/Input/AvaloniaKeyboard.cs
+++ b/src/Ryujinx/Input/AvaloniaKeyboard.cs
@@ -30,6 +30,11 @@ namespace Ryujinx.Ava.Input
            public readonly Key From = from;
        }

+        public bool SpecialExit()
+        {
+            return false;
+        }
+
        public AvaloniaKeyboard(AvaloniaKeyboardDriver driver, string id, string name)
        {
            _buttonsUserMapping = [];
--- a/src/Ryujinx/Input/AvaloniaMouse.cs
+++ b/src/Ryujinx/Input/AvaloniaMouse.cs
@@ -13,6 +13,11 @@ 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;
--- a/src/Ryujinx/Program.cs
+++ b/src/Ryujinx/Program.cs
@@ -21,7 +21,6 @@ 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;
@@ -244,33 +243,16 @@ namespace Ryujinx.Ava
                    : $"Launch Mode: {AppDataManager.Mode}");
        }

-        internal static void ProcessUnhandledException(object sender, Exception initialException, bool isTerminating)
+        internal static void ProcessUnhandledException(object sender, Exception ex, bool isTerminating)
        {
            Logger.Log log = Logger.Error ?? Logger.Notice;
+            string message = $"Unhandled exception caught: {ex}";

-            List<Exception> exceptions = [];
-
-            if (initialException is AggregateException ae)
-            {
-                exceptions.AddRange(ae.InnerExceptions);
-            }
+            // ReSharper disable once ConstantConditionalAccessQualifier
+            if (sender?.GetType()?.AsPrettyString() is { } senderName)
+                log.Print(LogClass.Application, message, senderName);
            else
-            {
-                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);
-            }
-            
-
-
+                log.PrintMsg(LogClass.Application, message);

            if (isTerminating)
                Exit();
--- a/src/Ryujinx/Ryujinx.csproj
+++ b/src/Ryujinx/Ryujinx.csproj
@@ -166,6 +166,7 @@
    <EmbeddedResource Include="Assets\UIImages\Logo_GitHub_Light.png" />
    <EmbeddedResource Include="Assets\UIImages\Logo_Ryujinx.png" />
    <EmbeddedResource Include="Assets\UIImages\Logo_Ryujinx_AntiAlias.png" />
+    <EmbeddedResource Include="Headless\Ryujinx.bmp" LogicalName="HeadlessLogo" />
  </ItemGroup>
  <ItemGroup>
    <AdditionalFiles Include="Assets\locales.json" />
@@ -173,10 +174,4 @@
  <ItemGroup>
    <Folder Include="Assets\Fonts\Mono\" />
  </ItemGroup>
-  <ItemGroup>
-    <Compile Update="UI\Applet\UserSelectorDialog.axaml.cs">
-      <DependentUpon>UserSelectorDialog.axaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
 </Project>
--- a/src/Ryujinx/UI/Applet/AvaHostUIHandler.cs
+++ b/src/Ryujinx/UI/Applet/AvaHostUIHandler.cs
@@ -1,24 +1,17 @@
 using Avalonia.Controls;
 using Avalonia.Threading;
 using FluentAvalonia.UI.Controls;
-using Gommon;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ava.UI.ViewModels.Input;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities.Configuration;
-using Ryujinx.Common;
 using Ryujinx.HLE;
 using Ryujinx.HLE.HOS.Applets;
 using Ryujinx.HLE.HOS.Applets.SoftwareKeyboard;
-using Ryujinx.HLE.HOS.Services.Account.Acc;
 using Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.ApplicationProxy.Types;
 using Ryujinx.HLE.UI;
 using System;
-using System.Collections.ObjectModel;
-using System.Linq;
 using System.Threading;

 namespace Ryujinx.Ava.UI.Applet
@@ -260,59 +253,5 @@ namespace Ryujinx.Ava.UI.Applet
        }

        public IDynamicTextInputHandler CreateDynamicTextInputHandler() => new AvaloniaDynamicTextInputHandler(_parent);
-        
-        public UserProfile ShowPlayerSelectDialog()
-        {
-            UserId selected = UserId.Null;
-            byte[] defaultGuestImage = EmbeddedResources.Read("Ryujinx.HLE/HOS/Services/Account/Acc/GuestUserImage.jpg");
-            UserProfile guest = new UserProfile(new UserId("00000000000000000000000000000080"), "Guest", defaultGuestImage);
-    
-            ManualResetEvent dialogCloseEvent = new(false);
-    
-            Dispatcher.UIThread.InvokeAsync(async () =>
-            {
-                ObservableCollection<BaseModel> profiles = [];
-                NavigationDialogHost nav = new();
-                
-                _parent.AccountManager.GetAllUsers()
-                    .OrderBy(x => x.Name)
-                    .ForEach(profile => profiles.Add(new Models.UserProfile(profile, nav)));
-                
-                profiles.Add(new Models.UserProfile(guest, nav));
-                UserSelectorDialogViewModel viewModel = new()
-                {
-                    Profiles = profiles, 
-                    SelectedUserId = _parent.AccountManager.LastOpenedUser.UserId
-                };
-                UserSelectorDialog content = new(viewModel);
-                (selected, _) = await UserSelectorDialog.ShowInputDialog(content);
-        
-                dialogCloseEvent.Set();
-            });
-    
-            dialogCloseEvent.WaitOne();
-            
-            UserProfile profile = _parent.AccountManager.LastOpenedUser;
-            if (selected == guest.UserId)
-            {
-                profile = guest;
-            }
-            else if (selected == UserId.Null)
-            {
-                profile = null;
-            }
-            else
-            {
-                foreach (UserProfile p in _parent.AccountManager.GetAllUsers())
-                {
-                    if (p.UserId == selected)
-                    {
-                        profile = p;
-                        break;
-                    }
-                }
-            }
-            return profile;
-        }
    }
 }
--- a/src/Ryujinx/UI/Applet/UserSelectorDialog.axaml
+++ b/src/Ryujinx/UI/Applet/UserSelectorDialog.axaml
@@ -1,121 +0,0 @@
-<UserControl
-    x:Class="Ryujinx.Ava.UI.Applet.UserSelectorDialog"
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
-    xmlns:models="clr-namespace:Ryujinx.Ava.UI.Models"
-    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
-    d:DesignHeight="450"
-    MinWidth="500"
-    d:DesignWidth="800"
-    mc:Ignorable="d"
-    Focusable="True"
-    x:DataType="viewModels:UserSelectorDialogViewModel">
-    
-    <UserControl.Resources>
-        <helpers:BitmapArrayValueConverter x:Key="ByteImage" />
-    </UserControl.Resources>
-    
-    <Design.DataContext>
-        <viewModels:UserSelectorDialogViewModel />
-    </Design.DataContext>
-    
-    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-        <Grid.RowDefinitions>
-            <RowDefinition />
-            <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-        
-        <Border
-            CornerRadius="5"
-            BorderBrush="{DynamicResource AppListHoverBackgroundColor}"
-            BorderThickness="1">
-            
-            <ListBox
-                MaxHeight="300"
-                HorizontalAlignment="Stretch"
-                VerticalAlignment="Center"
-                Background="Transparent"
-                ItemsSource="{Binding Profiles}"
-                SelectionChanged="ProfilesList_SelectionChanged">
-                
-                <ListBox.ItemsPanel>
-                    <ItemsPanelTemplate>
-                        <WrapPanel
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center"
-                            Orientation="Horizontal" />
-                    </ItemsPanelTemplate>
-                </ListBox.ItemsPanel>
-                
-                <ListBox.Styles>
-                    <Style Selector="ListBoxItem">
-                        <Setter Property="Margin" Value="5 5 0 5" />
-                        <Setter Property="CornerRadius" Value="5" />
-                    </Style>
-                    <Style Selector="Rectangle#SelectionIndicator">
-                        <Setter Property="Opacity" Value="0" />
-                    </Style>
-                </ListBox.Styles>
-                
-                <ListBox.DataTemplates>
-                    <DataTemplate
-                        DataType="models:UserProfile">
-                        <Grid
-                            PointerEntered="Grid_PointerEntered"
-                            PointerExited="Grid_OnPointerExited">
-                            <Border
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Stretch"
-                                ClipToBounds="True"
-                                CornerRadius="5"
-                                Background="{Binding BackgroundColor}">
-                                <StackPanel
-                                    HorizontalAlignment="Stretch"
-                                    VerticalAlignment="Stretch">
-                                    <Image
-                                        Width="96"
-                                        Height="96"
-                                        HorizontalAlignment="Stretch"
-                                        VerticalAlignment="Top"
-                                        Source="{Binding Image, Converter={StaticResource ByteImage}}" />
-                                    <TextBlock
-                                        HorizontalAlignment="Stretch"
-                                        MaxWidth="90"
-                                        Text="{Binding Name}"
-                                        TextAlignment="Center"
-                                        TextWrapping="Wrap"
-                                        TextTrimming="CharacterEllipsis"
-                                        MaxLines="2"
-                                        Margin="5" />
-                                </StackPanel>
-                            </Border>
-                        </Grid>
-                    </DataTemplate>
-                    <DataTemplate
-                        DataType="viewModels:BaseModel">
-                        <Panel
-                            Height="118"
-                            Width="96">
-                            <Panel.Styles>
-                                <Style Selector="Panel">
-                                    <Setter Property="Background" Value="{DynamicResource ListBoxBackground}" />
-                                </Style>
-                            </Panel.Styles>
-                        </Panel>
-                    </DataTemplate>
-                </ListBox.DataTemplates>
-            </ListBox>
-        </Border>
-        
-        <StackPanel
-            Grid.Row="1"
-            Margin="0 24 0 0"
-            HorizontalAlignment="Left"
-            Orientation="Horizontal"
-            Spacing="10">
-        </StackPanel>
-    </Grid>
-</UserControl>
--- a/src/Ryujinx/UI/Applet/UserSelectorDialog.axaml.cs
+++ b/src/Ryujinx/UI/Applet/UserSelectorDialog.axaml.cs
@@ -1,123 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Input;
-using FluentAvalonia.UI.Controls;
-using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Controls;
-using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ava.UI.ViewModels.Input;
-using Ryujinx.Common.Logging;
-using Ryujinx.HLE.HOS.Services.Account.Acc;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
-using UserProfile = Ryujinx.Ava.UI.Models.UserProfile;
-using UserProfileSft = Ryujinx.HLE.HOS.Services.Account.Acc.UserProfile;
-
-namespace Ryujinx.Ava.UI.Applet
-{
-    public partial class UserSelectorDialog : UserControl, INotifyPropertyChanged
-    {
-        public UserSelectorDialogViewModel ViewModel { get; set; }
-
-        public UserSelectorDialog(UserSelectorDialogViewModel viewModel)
-        {
-            InitializeComponent();
-            ViewModel = viewModel;
-            DataContext = ViewModel;
-        }
-        
-        private void Grid_PointerEntered(object sender, PointerEventArgs e)
-        {
-            if (sender is Grid { DataContext: UserProfile profile })
-            {
-                profile.IsPointerOver = true;
-            }
-        }
-
-        private void Grid_OnPointerExited(object sender, PointerEventArgs e)
-        {
-            if (sender is Grid { DataContext: UserProfile profile })
-            {
-                profile.IsPointerOver = false;
-            }
-        }
-
-        private void ProfilesList_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            if (sender is ListBox listBox)
-            {
-                int selectedIndex = listBox.SelectedIndex;
-
-                if (selectedIndex >= 0 && selectedIndex < ViewModel.Profiles.Count)
-                {
-                    if (ViewModel.Profiles[selectedIndex] is UserProfile userProfile)
-                    {
-                        ViewModel.SelectedUserId = userProfile.UserId;
-                        Logger.Info?.Print(LogClass.UI, $"Selected user: {userProfile.UserId}");
-
-                        ObservableCollection<BaseModel> newProfiles = [];
-
-                        foreach (var item in ViewModel.Profiles)
-                        {
-                            if (item is UserProfile originalItem)
-                            {
-                                var profile = new UserProfileSft(originalItem.UserId, originalItem.Name, originalItem.Image);
-                                
-                                if (profile.UserId == ViewModel.SelectedUserId)
-                                {
-                                    profile.AccountState = AccountState.Open;
-                                }
-
-                                newProfiles.Add(new UserProfile(profile, new NavigationDialogHost()));
-                            }
-                        }
-
-                        ViewModel.Profiles = newProfiles;
-                    }
-                }
-            }
-        }
-
-        public static async Task<(UserId Id, bool Result)> ShowInputDialog(UserSelectorDialog content)
-        {
-            ContentDialog contentDialog = new()
-            {
-                Title = LocaleManager.Instance[LocaleKeys.UserProfileWindowTitle],
-                PrimaryButtonText = LocaleManager.Instance[LocaleKeys.Continue],
-                SecondaryButtonText = string.Empty,
-                CloseButtonText = LocaleManager.Instance[LocaleKeys.Cancel],
-                Content = content,
-                Padding = new Thickness(0)
-            };
-
-            UserId result = UserId.Null;
-            bool input = false;
-
-            void Handler(ContentDialog sender, ContentDialogClosedEventArgs eventArgs)
-            {
-                if (eventArgs.Result == ContentDialogResult.Primary)
-                {
-                    if (contentDialog.Content is UserSelectorDialog view)
-                    {
-                        result = view.ViewModel.SelectedUserId;
-                        input = true;
-                    }
-                }
-                else
-                {
-                    result = UserId.Null;
-                    input = false;
-                }
-            }
-
-            contentDialog.Closed += Handler;
-
-            await ContentDialogHelper.ShowAsync(contentDialog);
-
-            return (result, input);
-        }
-    }
-}
--- a/src/Ryujinx/UI/Controls/UpdateWaitWindow.axaml
+++ b/src/Ryujinx/UI/Controls/UpdateWaitWindow.axaml
@@ -7,7 +7,6 @@
    Title="Ryujinx - Waiting"
    SizeToContent="WidthAndHeight"
    WindowStartupLocation="CenterOwner"
-    CanResize="False"
    mc:Ignorable="d"
    Focusable="True">
    <Grid
--- a/src/Ryujinx/UI/Helpers/Commands.cs
+++ b/src/Ryujinx/UI/Helpers/Commands.cs
@@ -1,48 +0,0 @@
-using CommunityToolkit.Mvvm.Input;
-using System;
-using System.Threading.Tasks;
-
-namespace Ryujinx.Ava.UI.Helpers
-{
-#nullable enable
-    public static class Commands
-    {
-        public static RelayCommand Create(Action action)
-            => new(action);
-        public static RelayCommand CreateConditional(Action action, Func<bool> canExecute)
-            => new(action, canExecute);
-        
-        public static RelayCommand<T> CreateWithArg<T>(Action<T?> action)
-            => new(action);
-        public static RelayCommand<T> CreateConditionalWithArg<T>(Action<T?> action, Predicate<T?> canExecute)
-            => new(action, canExecute);
-
-        public static AsyncRelayCommand Create(Func<Task> action)
-            => new(action, AsyncRelayCommandOptions.None);
-        public static AsyncRelayCommand CreateConcurrent(Func<Task> action)
-            => new(action, AsyncRelayCommandOptions.AllowConcurrentExecutions);
-        public static AsyncRelayCommand CreateSilentFail(Func<Task> action)
-            => new(action, AsyncRelayCommandOptions.FlowExceptionsToTaskScheduler);
-        
-        public static AsyncRelayCommand<T> CreateWithArg<T>(Func<T?, Task> action)
-            => new(action, AsyncRelayCommandOptions.None);
-        public static AsyncRelayCommand<T> CreateConcurrentWithArg<T>(Func<T?, Task> action)
-            => new(action, AsyncRelayCommandOptions.AllowConcurrentExecutions);
-        public static AsyncRelayCommand<T> CreateSilentFailWithArg<T>(Func<T?, Task> action)
-            => new(action, AsyncRelayCommandOptions.FlowExceptionsToTaskScheduler);
-
-        public static AsyncRelayCommand CreateConditional(Func<Task> action, Func<bool> canExecute)
-            => new(action, canExecute, AsyncRelayCommandOptions.None);
-        public static AsyncRelayCommand CreateConcurrentConditional(Func<Task> action, Func<bool> canExecute)
-            => new(action, canExecute, AsyncRelayCommandOptions.AllowConcurrentExecutions);
-        public static AsyncRelayCommand CreateSilentFailConditional(Func<Task> action, Func<bool> canExecute)
-            => new(action, canExecute, AsyncRelayCommandOptions.FlowExceptionsToTaskScheduler);
-        
-        public static AsyncRelayCommand<T> CreateConditionalWithArg<T>(Func<T?, Task> action, Predicate<T?> canExecute)
-            => new(action, canExecute, AsyncRelayCommandOptions.None);
-        public static AsyncRelayCommand<T> CreateConcurrentConditionalWithArg<T>(Func<T?, Task> action, Predicate<T?> canExecute)
-            => new(action, canExecute, AsyncRelayCommandOptions.AllowConcurrentExecutions);
-        public static AsyncRelayCommand<T> CreateSilentFailConditionalWithArg<T>(Func<T?, Task> action, Predicate<T?> canExecute)
-            => new(action, canExecute, AsyncRelayCommandOptions.FlowExceptionsToTaskScheduler);
-    }
-}
--- a/src/Ryujinx/UI/Models/StatusUpdatedEventArgs.cs
+++ b/src/Ryujinx/UI/Models/StatusUpdatedEventArgs.cs
@@ -22,22 +22,5 @@ namespace Ryujinx.Ava.UI.Models
            FifoStatus = fifoStatus;
            ShaderCount = shaderCount;
        }
-
-
-        public override bool Equals(object obj)
-        {
-            if (obj is not StatusUpdatedEventArgs suea) return false;
-            return
-                VSyncMode == suea.VSyncMode &&
-                VolumeStatus == suea.VolumeStatus &&
-                DockedMode == suea.DockedMode &&
-                AspectRatio == suea.AspectRatio &&
-                GameStatus == suea.GameStatus &&
-                FifoStatus == suea.FifoStatus &&
-                ShaderCount == suea.ShaderCount;
-        }
-
-        public override int GetHashCode() 
-            => HashCode.Combine(VSyncMode, VolumeStatus, AspectRatio, DockedMode, FifoStatus, GameStatus, ShaderCount);
    }
 }
--- a/src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs
@@ -27,7 +27,7 @@ namespace Ryujinx.Ava.UI.ViewModels
            ThemeManager.ThemeChanged += ThemeManager_ThemeChanged;
        }

-        private void ThemeManager_ThemeChanged()
+        private void ThemeManager_ThemeChanged(object sender, EventArgs e)
        {
            Dispatcher.UIThread.Post(() => UpdateLogoTheme(ConfigurationState.Instance.UI.BaseStyle.Value));
        }
--- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
@@ -38,6 +38,7 @@ using Ryujinx.HLE.HOS.Services.Account.Acc;
 using Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption;
 using Ryujinx.HLE.UI;
 using Ryujinx.Input.HLE;
+using Silk.NET.Vulkan;
 using SkiaSharp;
 using System;
 using System.Collections.Generic;
@@ -1048,6 +1049,7 @@ namespace Ryujinx.Ava.UI.ViewModels

        private void InitializeGame()
        {
+            
            RendererHostControl.WindowCreated += RendererHost_Created;

            AppHost.StatusUpdatedEvent += Update_StatusBar;
@@ -1057,7 +1059,13 @@ namespace Ryujinx.Ava.UI.ViewModels

            AppHost?.Start();

+            if (AppHost?.IsSpecialExit() == true)
+            {
+                Window.ForceExit();
+            }
+
            AppHost?.DisposeContext();
+
        }

        private async Task HandleRelaunch()
--- a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
@@ -128,6 +128,7 @@ 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;
@@ -259,6 +260,8 @@ 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;
@@ -511,6 +514,13 @@ 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);
@@ -618,6 +628,13 @@ 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();
--- a/src/Ryujinx/UI/ViewModels/UserSelectorDialogViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/UserSelectorDialogViewModel.cs
@@ -1,14 +0,0 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-using Ryujinx.HLE.HOS.Services.Account.Acc;
-using System.Collections.ObjectModel;
-
-namespace Ryujinx.Ava.UI.ViewModels
-{
-    public partial class UserSelectorDialogViewModel : BaseModel
-    {
-
-        [ObservableProperty] private UserId _selectedUserId;
-
-        [ObservableProperty] private ObservableCollection<BaseModel> _profiles = [];
-    }
-}
--- a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs
@@ -43,13 +43,7 @@ namespace Ryujinx.Ava.UI.Views.Main
            PauseEmulationMenuItem.Command = new RelayCommand(() => ViewModel.AppHost?.Pause());
            ResumeEmulationMenuItem.Command = new RelayCommand(() => ViewModel.AppHost?.Resume());
            StopEmulationMenuItem.Command = new AsyncRelayCommand(() => ViewModel.AppHost?.ShowExitPrompt().OrCompleted());
-            CheatManagerMenuItem.Command = new AsyncRelayCommand(async () =>
-            {
-                try
-                {
-                    await OpenCheatManagerForCurrentApp();
-                } catch {}
-            });
+            CheatManagerMenuItem.Command = new AsyncRelayCommand(OpenCheatManagerForCurrentApp);
            InstallFileTypesMenuItem.Command = new AsyncRelayCommand(InstallFileTypes);
            UninstallFileTypesMenuItem.Command = new AsyncRelayCommand(UninstallFileTypes);
            XciTrimmerMenuItem.Command = new AsyncRelayCommand(() => XCITrimmerWindow.Show(ViewModel));
@@ -144,14 +138,14 @@ namespace Ryujinx.Ava.UI.Views.Main
            ViewModel.LoadConfigurableHotKeys();
        }

-        public AppletMetadata MiiApplet => new(ViewModel.ContentManager, "miiEdit", 0x0100000000001009);
-        
+        public static readonly AppletMetadata MiiApplet = new("miiEdit", 0x0100000000001009);
+
        public async Task OpenMiiApplet()
        {
-            if (!MiiApplet.CanStart(out var appData, out var nacpData)) 
-                return;
-            
-            await ViewModel.LoadApplication(appData, ViewModel.IsFullScreen || ViewModel.StartGamesInFullscreen, nacpData);
+            if (MiiApplet.CanStart(ViewModel.ContentManager, out var appData, out var nacpData))
+            {
+                await ViewModel.LoadApplication(appData, ViewModel.IsFullScreen || ViewModel.StartGamesInFullscreen, nacpData);
+            }
        }

        public async Task OpenCheatManagerForCurrentApp()
--- a/src/Ryujinx/UI/Views/Settings/SettingsInputView.axaml
+++ b/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,6 +58,20 @@
                                <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>
--- a/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
@@ -136,12 +136,6 @@
                            <ComboBoxItem>
                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageBrazilianPortuguese}" />
                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageSwedish}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageNorwegian}" />
-                            </ComboBoxItem>
                        </ComboBox>
                    </StackPanel>
                    <StackPanel
--- a/src/Ryujinx/UI/Windows/DownloadableContentManagerWindow.axaml
+++ b/src/Ryujinx/UI/Windows/DownloadableContentManagerWindow.axaml
@@ -7,7 +7,6 @@
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
-    xmlns:pi="using:Projektanker.Icons.Avalonia"
    xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
    xmlns:models="clr-namespace:Ryujinx.Ava.Common.Models"
    Width="500"
@@ -90,7 +89,7 @@
                <ListBox.DataTemplates>
                    <DataTemplate
                        DataType="models:DownloadableContentModel">
-                        <Panel Margin="10" Background="Transparent">
+                        <Panel Margin="10">
                            <Grid ColumnDefinitions="*,Auto">
                                <Grid
                                    Grid.Column="0" ColumnDefinitions="*,Auto">
@@ -120,15 +119,6 @@
                                    Spacing="10"
                                    Orientation="Horizontal"
                                    HorizontalAlignment="Right">
-                                    <Button 
-                                        VerticalAlignment="Center"
-                                        HorizontalAlignment="Right"
-                                        Padding="10"
-                                        MinWidth="0"
-                                        MinHeight="0"
-                                        Click="DlcItem_DumpRomfs">
-                                        <ui:SymbolIcon Symbol="MoveToFolder"/>
-                                    </Button>
                                    <Button
                                        VerticalAlignment="Center"
                                        HorizontalAlignment="Right"
--- a/src/Ryujinx/UI/Windows/DownloadableContentManagerWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/DownloadableContentManagerWindow.axaml.cs
@@ -2,8 +2,6 @@ using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Styling;
 using FluentAvalonia.UI.Controls;
-using LibHac.Tools.FsSystem.NcaUtils;
-using Ryujinx.Ava.Common;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.UI.ViewModels;
@@ -95,18 +93,5 @@ namespace Ryujinx.Ava.UI.Windows
                }
            }
        }
-        
-        private async void DlcItem_DumpRomfs(object sender, RoutedEventArgs e)
-        {
-            if (sender is not Button { DataContext: DownloadableContentModel dlc }) return;
-            if (RyujinxApp.MainWindow.ViewModel is not { } viewModel)
-                return;
-            
-            await ApplicationHelper.ExtractAoc(
-                viewModel.StorageProvider,
-                NcaSectionType.Data,
-                dlc.ContainerPath,
-                dlc.FileName);
-        }
    }
 }
--- a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
@@ -32,7 +32,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reactive.Linq;
-using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
 using System.Threading;
 using System.Threading.Tasks;
@@ -46,6 +45,7 @@ namespace Ryujinx.Ava.UI.Windows
        internal readonly AvaHostUIHandler UiHandler;

        private bool _isLoading;
+        private bool _isExitWithoutConfirm = false;
        private bool _applicationsLoadedOnce;

        private UserChannelPersistence _userChannelPersistence;
@@ -137,8 +137,6 @@ namespace Ryujinx.Ava.UI.Windows
            base.OnApplyTemplate(e);

            NotificationHelper.SetNotificationManager(this);
-
-            Executor.ExecuteBackgroundAsync(ShowIntelMacWarningAsync);
        }

        private void OnScalingChanged(object sender, EventArgs e)
@@ -574,11 +572,11 @@ namespace Ryujinx.Ava.UI.Windows

        protected override void OnClosing(WindowClosingEventArgs e)
        {
-            if (!ViewModel.IsClosing && ViewModel.AppHost != null && ConfigurationState.Instance.ShowConfirmExit)
+            if (!ViewModel.IsClosing && ViewModel.AppHost != null && ConfigurationState.Instance.ShowConfirmExit && !_isExitWithoutConfirm)
            {
                e.Cancel = true;

-                ConfirmExit();
+                ConfirmExit(); 

                return;
            }
@@ -619,6 +617,12 @@ namespace Ryujinx.Ava.UI.Windows
            base.OnClosing(e);
        }

+        public void ForceExit() 
+        {
+            _isExitWithoutConfirm = true;
+             Close();
+        }
+
        private void ConfirmExit()
        {
            Dispatcher.UIThread.InvokeAsync(async () =>
@@ -734,20 +738,5 @@ namespace Ryujinx.Ava.UI.Windows
                    (int)Symbol.Checkmark);
            });
        }
-
-        private static bool _intelMacWarningShown = !(OperatingSystem.IsMacOS() &&
-                                                     (RuntimeInformation.OSArchitecture == Architecture.X64 ||
-                                                      RuntimeInformation.OSArchitecture == Architecture.X86));
-
-        public static async Task ShowIntelMacWarningAsync()
-        {
-            if (_intelMacWarningShown) return;
-            
-            await Dispatcher.UIThread.InvokeAsync(async () => await ContentDialogHelper.CreateWarningDialog(
-                "Intel Mac Warning",
-                "Intel Macs are not supported and will not work properly.\nIf you continue, do not come to our Discord asking for support;\nand do not report bugs on the GitHub. They will be closed."));
-
-            _intelMacWarningShown = true;
-        }
    }
 }
--- a/src/Ryujinx/Utilities/AppletMetadata.cs
+++ b/src/Ryujinx/Utilities/AppletMetadata.cs
@@ -54,9 +54,5 @@ namespace Ryujinx.Ava.Utilities
            appControl = new BlitStruct<ApplicationControlProperty>(0);
            return false;
        }
-
-        public bool CanStart(out ApplicationData appData,
-            out BlitStruct<ApplicationControlProperty> appControl)
-            => CanStart(null, out appData, out appControl);
    }
 }
--- a/src/Ryujinx/Utilities/Compat/CompatibilityCsv.cs
+++ b/src/Ryujinx/Utilities/Compat/CompatibilityCsv.cs
@@ -28,9 +28,7 @@ namespace Ryujinx.Ava.Utilities.Compat
    
    public class CompatibilityCsv
    {
-        static CompatibilityCsv() => Load();
-
-        public static void Load()
+        static CompatibilityCsv()
        {
            using Stream csvStream = Assembly.GetExecutingAssembly()
                .GetManifestResourceStream("RyujinxGameCompatibilityList")!;
@@ -39,31 +37,15 @@ namespace Ryujinx.Ava.Utilities.Compat
            using SepReader reader = Sep.Reader().From(csvStream);
            ColumnIndices columnIndices = new(reader.Header.IndexOf);

-            _entries = reader
+            Entries = reader
                .Enumerate(row => new CompatibilityEntry(ref columnIndices, row))
                .OrderBy(it => it.GameName)
                .ToArray();
            
-            Logger.Debug?.Print(LogClass.UI, "Compatibility CSV loaded.", "LoadCompatibility");
+            Logger.Debug?.Print(LogClass.UI, "Compatibility CSV loaded.", "LoadCompatCsv");
        }

-        public static void Unload()
-        {
-            _entries = null;
-        }
-
-        private static CompatibilityEntry[] _entries;
-        
-        public static CompatibilityEntry[] Entries 
-        {
-            get
-            {
-                if (_entries == null)
-                    Load();
-                
-                return _entries;
-            }
-        }
+        public static CompatibilityEntry[] Entries { get; private set; }
    }

    public class CompatibilityEntry
--- a/src/Ryujinx/Utilities/Compat/CompatibilityList.axaml.cs
+++ b/src/Ryujinx/Utilities/Compat/CompatibilityList.axaml.cs
@@ -1,8 +1,11 @@
 using Avalonia.Controls;
 using Avalonia.Styling;
 using FluentAvalonia.UI.Controls;
+using nietras.SeparatedValues;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Helpers;
+using System.IO;
+using System.Reflection;
 using System.Threading.Tasks;

 namespace Ryujinx.Ava.Utilities.Compat
@@ -32,8 +35,6 @@ namespace Ryujinx.Ava.Utilities.Compat
            contentDialog.Styles.Add(closeButtonParent);

            await ContentDialogHelper.ShowAsync(contentDialog);
-            
-            CompatibilityCsv.Unload();
        }
        
        public CompatibilityList()
--- a/src/Ryujinx/Utilities/Compat/CompatibilityViewModel.cs
+++ b/src/Ryujinx/Utilities/Compat/CompatibilityViewModel.cs
@@ -1,18 +1,19 @@
 using CommunityToolkit.Mvvm.ComponentModel;
+using ExCSS;
 using Gommon;
-using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Utilities.AppLibrary;
 using System.Collections.Generic;
 using System.Linq;

 namespace Ryujinx.Ava.Utilities.Compat
 {
-    public class CompatibilityViewModel : BaseModel
+    public partial class CompatibilityViewModel : ObservableObject
    {
-        private bool _onlyShowOwnedGames = true;
+        [ObservableProperty] private bool _onlyShowOwnedGames = true;

        private IEnumerable<CompatibilityEntry> _currentEntries = CompatibilityCsv.Entries;
-        private string[] _ownedGameTitleIds = [];
+        private readonly string[] _ownedGameTitleIds = [];
+        private readonly ApplicationLibrary _appLibrary;

        public IEnumerable<CompatibilityEntry> CurrentEntries => OnlyShowOwnedGames
            ? _currentEntries.Where(x =>
@@ -23,23 +24,14 @@ namespace Ryujinx.Ava.Utilities.Compat

        public CompatibilityViewModel(ApplicationLibrary appLibrary)
        {
-            appLibrary.ApplicationCountUpdated += (_, _) 
-                => _ownedGameTitleIds = appLibrary.Applications.Keys.Select(x => x.ToString("X16")).ToArray();
-            
+            _appLibrary = appLibrary;
            _ownedGameTitleIds = appLibrary.Applications.Keys.Select(x => x.ToString("X16")).ToArray();
-        }

-        public bool OnlyShowOwnedGames
-        {
-            get => _onlyShowOwnedGames;
-            set
+            PropertyChanged += (_, args) =>
            {
-                OnPropertyChanging();
-                OnPropertyChanging(nameof(CurrentEntries));
-                _onlyShowOwnedGames = value;
-                OnPropertyChanged();
-                OnPropertyChanged(nameof(CurrentEntries));
-            }
+                if (args.PropertyName is nameof(OnlyShowOwnedGames))
+                    OnPropertyChanged(nameof(CurrentEntries));
+            };
        }

        public void Search(string searchTerm)
--- a/src/Ryujinx/Utilities/Configuration/ConfigurationFileFormat.cs
+++ b/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 = 59;
+        public const int CurrentVersion = 60;

        /// <summary>
        /// Version of the configuration file format
@@ -366,6 +366,12 @@ 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>
--- a/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs
+++ b/src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs
@@ -136,6 +136,7 @@ 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 ?? [];

@@ -414,6 +415,10 @@ 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;
                })
            );
    }
--- a/src/Ryujinx/Utilities/Configuration/ConfigurationState.Model.cs
+++ b/src/Ryujinx/Utilities/Configuration/ConfigurationState.Model.cs
@@ -420,6 +420,13 @@ 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>
@@ -436,6 +443,7 @@ 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>>();
            }
--- a/src/Ryujinx/Utilities/Configuration/ConfigurationState.cs
+++ b/src/Ryujinx/Utilities/Configuration/ConfigurationState.cs
@@ -128,6 +128,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
                ShowConsole = UI.ShowConsole,
                EnableKeyboard = Hid.EnableKeyboard,
                EnableMouse = Hid.EnableMouse,
+                SpecialExitEmulator = Hid.SpecialExitEmulator,
                Hotkeys = Hid.Hotkeys,
                KeyboardConfig = [],
                ControllerConfig = [],
@@ -241,6 +242,7 @@ 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,
--- a/src/Ryujinx/Utilities/TitleHelper.cs
+++ b/src/Ryujinx/Utilities/TitleHelper.cs
@@ -4,7 +4,7 @@ namespace Ryujinx.Ava.Utilities
 {
    public static class TitleHelper
    {
-        public static string ActiveApplicationTitle(ProcessResult activeProcess, string applicationVersion, bool customTitlebar, string pauseString = "")
+        public static string ActiveApplicationTitle(ProcessResult activeProcess, string applicationVersion, string pauseString = "")
        {
            if (activeProcess == null)
                return string.Empty;
@@ -14,9 +14,7 @@ namespace Ryujinx.Ava.Utilities
            string titleIdSection = $" ({activeProcess.ProgramIdText.ToUpper()})";
            string titleArchSection = activeProcess.Is64Bit ? " (64-bit)" : " (32-bit)";

-            string appTitle = customTitlebar 
-                ? $"Ryujinx {applicationVersion}\n{titleNameSection.Trim()}\n{titleVersionSection.Trim()}\n{titleIdSection.Trim()}{titleArchSection}"
-                : $"Ryujinx {applicationVersion} -{titleNameSection}{titleVersionSection}{titleIdSection}{titleArchSection}";
+            string appTitle = $"Ryujinx {applicationVersion} -{titleNameSection}{titleVersionSection}{titleIdSection}{titleArchSection}";

            return !string.IsNullOrEmpty(pauseString)
                ? appTitle + $" ({pauseString})"
Author	SHA1	Message	Date
Vladimir Sokolov	44de9b378b	Merge branch 'master' into master	2025-01-11 22:54:24 +10:00
Vova	2ec032c48b	Added description in another file	2025-01-11 22:37:33 +10:00
Vova	f75efbea54	oops, rename to"SpecialExitEmulator"	2025-01-11 22:27:28 +10:00
Vova	11f1922a82	fix specialExitEmulator -> SpecialExitEmulator, Added description to clarify function	2025-01-11 22:20:08 +10:00
Vladimir Sokolov	de18c4927f	Merge branch 'master' into master	2025-01-11 21:26:51 +10:00
Evan Husted	78e7a3085a	add back a comment that was removed for no reason	2025-01-10 21:16:31 -06:00
Evan Husted	01e22f1c67	newline brace	2025-01-10 21:13:39 -06:00
Vladimir Sokolov	3352d70ea4	Update SettingsViewModel.cs small fix	2025-01-11 10:43:38 +10:00
Vladimir Sokolov	864cd57b51	Merge branch 'master' into master	2025-01-10 20:47:37 +10:00
Vladimir Sokolov	06cd53925c	Merge branch 'master' into master	2025-01-10 10:14:47 +10:00
Vladimir Sokolov	33fefb1323	Merge branch 'master' into master	2025-01-09 07:55:05 +10:00
Vladimir Sokolov	0c503e10ae	Update SettingsViewModel.cs	2025-01-08 23:09:09 +10:00
Vova	1c6390cbfb	minor bugs fixed	2025-01-08 23:05:58 +10:00
Vova	c20452be61	Fixed a bug where the emulator would still terminate the game when pressing a hotkey (unnecessary check removed)	2025-01-08 23:00:41 +10:00
Vova	b6667a8352	multiple fixes, variable typo fixes, adherence to a certain style. Fixed initialization of the new function, defaults to 0	2025-01-08 22:45:33 +10:00
Vova	37b4dd2133	Added new option "exit by pressing plus and minus buttons" to the input section.	2025-01-08 21:43:18 +10:00
Vladimir Sokolov	007d3bc045	Merge branch 'Ryubing:master' into master	2025-01-08 18:53:27 +10:00
Vladimir Sokolov	be2aa5ae8f	Merge branch 'Ryubing:master' into master	2024-12-30 14:27:54 +10:00
Vladimir Sokolov	7f5978155b	Merge branch 'GreemDev:master' into master	2024-12-24 20:59:34 +10:00
Vladimir Sokolov	cd43362042	Merge branch 'GreemDev:master' into master	2024-12-22 19:55:43 +10:00
Vova	39e8283fb8	Merge branch 'master' of https://github.com/Goodfeat/Ryujinx_alt	2024-12-15 09:33:41 +10:00
Vladimir Sokolov	3e3de18976	Merge branch 'GreemDev:master' into master	2024-11-30 11:01:14 +10:00
Vladimir Sokolov	a158a93d0a	Merge branch 'GreemDev:master' into master	2024-11-25 09:10:46 +10:00
Vladimir Sokolov	ff90b68d09	Merge branch 'GreemDev:master' into master	2024-11-23 21:22:17 +10:00
Vladimir Sokolov	d7bd165861	Merge branch 'GreemDev:master' into master	2024-11-21 09:15:18 +10:00
Vladimir Sokolov	5bfa01b58a	Merge branch 'GreemDev:master' into master	2024-11-13 09:45:58 +10:00
Vladimir Sokolov	7c30426f89	Merge branch 'GreemDev:master' into master	2024-11-10 15:42:43 +10:00
Vladimir Sokolov	267aaca87d	Merge branch 'GreemDev:master' into master	2024-11-10 14:41:40 +10:00
Vova	b9012e291b	code cleaning	2024-11-10 14:41:02 +10:00
Vladimir Sokolov	7da4a917ba	Merge branch 'GreemDev:master' into master	2024-11-10 13:13:11 +10:00
Vladimir Sokolov	4bab858793	Merge branch 'GreemDev:master' into master	2024-11-09 20:21:57 +10:00
Vladimir Sokolov	ca7c17186e	Merge branch 'GreemDev:master' into master	2024-11-04 20:47:13 +10:00
Vladimir Sokolov	ea061cf60c	Merge branch 'GreemDev:master' into master	2024-11-03 18:55:10 +10:00
Vova	d83da7d2fb	Fixed the logic of saving the input section. Added a new dialog box when changing parameters	2024-11-02 22:42:57 +10:00
Vladimir Sokolov	25499cbbf6	Merge branch 'GreemDev:master' into master	2024-11-02 22:38:33 +10:00
Vova	8074a4dd87	Fixed a visual bug in "input settings", when switching between players the settings were reset to default	2024-10-31 18:19:05 +10:00
Vova	13d2498405	test	2024-10-31 18:09:55 +10:00