Set LSApplicationCategoryType to games (#4257 )

https://developer.apple.com/documentation/bundleresources/information_property_list/lsapplicationcategorytype Makes it auto-add to the macOS Launchpad games folder
Fix context menu locales (#4242 )
2023-01-10 21:49:46 +00:00 · 2023-01-10 19:15:15 +01:00 · 2023-01-10 19:00:14 +01:00 · 2023-01-10 18:45:55 +01:00 · 2023-01-10 09:22:25 +01:00 · 2023-01-10 00:59:23 +01:00
33 changed files with 2042 additions and 2131 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,63 +1,4 @@
 ###############################################################################
 # Set default behavior to automatically normalize line endings.
 ###############################################################################
-* text=auto
-
-###############################################################################
-# Set default behavior for command prompt diff.
-#
-# This is need for earlier builds of msysgit that does not have it on by
-# default for csharp files.
-# Note: This is only used by command line
-###############################################################################
-#*.cs     diff=csharp
-
-###############################################################################
-# Set the merge driver for project and solution files
-#
-# Merging from the command prompt will add diff markers to the files if there
-# are conflicts (Merging from VS is not affected by the settings below, in VS
-# the diff markers are never inserted). Diff markers may cause the following 
-# file extensions to fail to load in VS. An alternative would be to treat
-# these files as binary and thus will always conflict and require user
-# intervention with every merge. To do so, just uncomment the entries below
-###############################################################################
-#*.sln       merge=binary
-#*.csproj    merge=binary
-#*.vbproj    merge=binary
-#*.vcxproj   merge=binary
-#*.vcproj    merge=binary
-#*.dbproj    merge=binary
-#*.fsproj    merge=binary
-#*.lsproj    merge=binary
-#*.wixproj   merge=binary
-#*.modelproj merge=binary
-#*.sqlproj   merge=binary
-#*.wwaproj   merge=binary
-
-###############################################################################
-# behavior for image files
-#
-# image files are treated as binary by default.
-###############################################################################
-#*.jpg   binary
-#*.png   binary
-#*.gif   binary
-
-###############################################################################
-# diff behavior for common document formats
-# 
-# Convert binary document formats to text before diffing them. This feature
-# is only available from the command line. Turn it on by uncommenting the 
-# entries below.
-###############################################################################
-#*.doc   diff=astextplain
-#*.DOC   diff=astextplain
-#*.docx  diff=astextplain
-#*.DOCX  diff=astextplain
-#*.dot   diff=astextplain
-#*.DOT   diff=astextplain
-#*.pdf   diff=astextplain
-#*.PDF   diff=astextplain
-#*.rtf   diff=astextplain
-#*.RTF   diff=astextplain
+* text=auto eol=lf
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -69,12 +69,6 @@ jobs:
      - name: Publish Ryujinx.Ava
        run: dotnet publish -c "${{ matrix.configuration }}" -r "${{ matrix.DOTNET_RUNTIME_IDENTIFIER }}" -o ./publish_ava -p:Version="${{ env.RYUJINX_BASE_VERSION }}" -p:DebugType=embedded -p:SourceRevisionId="${{ steps.git_short_hash.outputs.result }}" -p:ExtraDefineConstants=DISABLE_UPDATER Ryujinx.Ava --self-contained true
        if: github.event_name == 'pull_request'
-      - name: Rename Avalonia (Windows)
-        run: mv ./publish_ava/Ryujinx.Ava.exe ./publish_ava/Ryujinx.exe
-        if: runner.os == 'Windows' && github.event_name == 'pull_request'
-      - name: Rename Avalonia (Unix)
-        run: mv ./publish_ava/Ryujinx.Ava ./publish_ava/Ryujinx
-        if: runner.os != 'Windows' && github.event_name == 'pull_request'
      - name: Upload Ryujinx artifact
        uses: actions/upload-artifact@v3
        with:
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -46,13 +46,11 @@ jobs:
        shell: bash
      - name: Create output dir
        run: "mkdir release_output"
-
      - name: Publish Windows
        run: |
          dotnet publish -c Release -r win10-x64 -o ./publish_windows/publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded Ryujinx --self-contained true
          dotnet publish -c Release -r win10-x64 -o ./publish_windows_sdl2_headless/publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded Ryujinx.Headless.SDL2 --self-contained true
          dotnet publish -c Release -r win10-x64 -o ./publish_windows_ava/publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded Ryujinx.Ava --self-contained true
-          mv ./publish_windows_ava/publish/Ryujinx.Ava.exe ./publish_windows_ava/publish/Ryujinx.exe
      - name: Packing Windows builds
        run: |
          pushd publish_windows
@@ -73,26 +71,29 @@ jobs:
          dotnet publish -c Release -r linux-x64 -o ./publish_linux/publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded Ryujinx --self-contained true
          dotnet publish -c Release -r linux-x64 -o ./publish_linux_sdl2_headless/publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded Ryujinx.Headless.SDL2 --self-contained true
          dotnet publish -c Release -r linux-x64 -o ./publish_linux_ava/publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded Ryujinx.Ava --self-contained true
-          mv ./publish_linux_ava/publish/Ryujinx.Ava ./publish_linux_ava/publish/Ryujinx
+
      - name: Packing Linux builds
        run: |
          pushd publish_linux
-          tar --exclude "publish/Ryujinx" -cvf ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar publish
+          tar --exclude "publish/Ryujinx" --exclude "publish/Ryujinx.sh" -cvf ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar publish
          python3 ../distribution/misc/add_tar_exec.py ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar "publish/Ryujinx" "publish/Ryujinx"
+          python3 ../distribution/misc/add_tar_exec.py ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar "publish/Ryujinx.sh" "publish/Ryujinx.sh"
          gzip -9 < ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar > ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz
          rm ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar
          popd

          pushd publish_linux_sdl2_headless
-          tar --exclude "publish/Ryujinx.Headless.SDL2" -cvf ../release_output/sdl2-ryujinx-headless-${{ steps.version_info.outputs.build_version }}-linux_x64.tar publish
+          tar --exclude "publish/Ryujinx.Headless.SDL2" --exclude "publish/Ryujinx.sh" -cvf ../release_output/sdl2-ryujinx-headless-${{ steps.version_info.outputs.build_version }}-linux_x64.tar publish
          python3 ../distribution/misc/add_tar_exec.py ../release_output/sdl2-ryujinx-headless-${{ steps.version_info.outputs.build_version }}-linux_x64.tar "publish/Ryujinx.Headless.SDL2" "publish/Ryujinx.Headless.SDL2"
+          python3 ../distribution/misc/add_tar_exec.py ../release_output/sdl2-ryujinx-headless-${{ steps.version_info.outputs.build_version }}-linux_x64.tar "publish/Ryujinx.sh" "publish/Ryujinx.sh"
          gzip -9 < ../release_output/sdl2-ryujinx-headless-${{ steps.version_info.outputs.build_version }}-linux_x64.tar > ../release_output/sdl2-ryujinx-headless-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz
          rm ../release_output/sdl2-ryujinx-headless-${{ steps.version_info.outputs.build_version }}-linux_x64.tar
          popd

          pushd publish_linux_ava
-          tar --exclude "publish/Ryujinx" -cvf ../release_output/test-ava-ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar publish
-          python3 ../distribution/misc/add_tar_exec.py ../release_output/test-ava-ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar "publish/Ryujinx" "publish/Ryujinx"
+          tar --exclude "publish/Ryujinx.Ava" --exclude "publish/Ryujinx.sh" -cvf ../release_output/test-ava-ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar publish
+          python3 ../distribution/misc/add_tar_exec.py ../release_output/test-ava-ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar "publish/Ryujinx.Ava" "publish/Ryujinx.Ava"
+          python3 ../distribution/misc/add_tar_exec.py ../release_output/test-ava-ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar "publish/Ryujinx.sh" "publish/Ryujinx.sh"
          gzip -9 < ../release_output/test-ava-ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar > ../release_output/test-ava-ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz
          rm ../release_output/test-ava-ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar
          popd
--- a/Ryujinx.Audio/Backends/CompatLayer/CompatLayerHardwareDeviceDriver.cs
+++ b/Ryujinx.Audio/Backends/CompatLayer/CompatLayerHardwareDeviceDriver.cs
@@ -15,6 +15,8 @@ namespace Ryujinx.Audio.Backends.CompatLayer
    {
        private IHardwareDeviceDriver _realDriver;

+        public static bool IsSupported => true;
+
        public CompatLayerHardwareDeviceDriver(IHardwareDeviceDriver realDevice)
        {
            _realDriver = realDevice;
--- a/Ryujinx.Audio/Backends/Dummy/DummyHardwareDeviceDriver.cs
+++ b/Ryujinx.Audio/Backends/Dummy/DummyHardwareDeviceDriver.cs
@@ -12,6 +12,8 @@ namespace Ryujinx.Audio.Backends.Dummy
        private ManualResetEvent _updateRequiredEvent;
        private ManualResetEvent _pauseEvent;

+        public static bool IsSupported => true;
+
        public DummyHardwareDeviceDriver()
        {
            _updateRequiredEvent = new ManualResetEvent(false);
--- a/Ryujinx.Audio/Integration/IHardwareDeviceDriver.cs
+++ b/Ryujinx.Audio/Integration/IHardwareDeviceDriver.cs
@@ -26,6 +26,8 @@ namespace Ryujinx.Audio.Integration
        bool SupportsSampleFormat(SampleFormat sampleFormat);
        bool SupportsChannelCount(uint channelCount);

+        static abstract bool IsSupported { get; }
+
        IHardwareDeviceDriver GetRealDeviceDriver()
        {
            return this;
--- a/Ryujinx.Ava/AppHost.cs
+++ b/Ryujinx.Ava/AppHost.cs
@@ -41,6 +41,7 @@ using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
 using SPB.Graphics.Vulkan;
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Threading;
@@ -57,95 +58,96 @@ namespace Ryujinx.Ava
 {
    internal class AppHost
    {
-        private const int CursorHideIdleTime = 8; // Hide Cursor seconds
+        private const int   CursorHideIdleTime = 8;    // Hide Cursor seconds.
        private const float MaxResolutionScale = 4.0f; // Max resolution hotkeys can scale to before wrapping.
-        private const int TargetFps = 60;
+        private const int   TargetFps          = 60;
+        private const float VolumeDelta        = 0.05f;

-        private const float VolumeDelta = 0.05f;
+        private static readonly Cursor InvisibleCursor = new(StandardCursorType.None);

-        private static readonly Cursor InvisibleCursor = new Cursor(StandardCursorType.None);
-
-        private readonly long _ticksPerFrame;
+        private readonly long      _ticksPerFrame;
        private readonly Stopwatch _chrono;
-        private readonly AccountManager _accountManager;
+        private long               _ticks;
+
+        private readonly AccountManager         _accountManager;
        private readonly UserChannelPersistence _userChannelPersistence;
-        private readonly InputManager _inputManager;
+        private readonly InputManager           _inputManager;
+
        private readonly MainWindowViewModel _viewModel;
-        private readonly IKeyboard _keyboardInterface;
+        private readonly IKeyboard           _keyboardInterface;
+        private readonly TopLevel            _topLevel;
+
        private readonly GraphicsDebugLevel _glLogLevel;
+        private float                       _newVolume;
+        private KeyboardHotkeyState         _prevHotkeyState;

        private bool _hideCursorOnIdle;
+        private long _lastCursorMoveTime;
+        private bool _isCursorInRenderer;
+
        private bool _isStopped;
        private bool _isActive;
-        private long _lastCursorMoveTime;
-        private float _newVolume;
-        private long _ticks = 0;
-
-        private KeyboardHotkeyState _prevHotkeyState;
-
-        private IRenderer _renderer;
-        private readonly Thread _renderingThread;
-
-        private bool _isMouseInRenderer;
        private bool _renderingStarted;
-        private bool _dialogShown;

+        private IRenderer                        _renderer;
+        private readonly Thread                  _renderingThread;
+        private readonly CancellationTokenSource _gpuCancellationTokenSource;
        private WindowsMultimediaTimerResolution _windowsMultimediaTimerResolution;

-        private readonly CancellationTokenSource _gpuCancellationTokenSource;
+        private bool          _dialogShown;
+        private readonly bool _isFirmwareTitle;
+
+        private readonly object _lockObject = new();

        public event EventHandler AppExit;
        public event EventHandler<StatusUpdatedEventArgs> StatusUpdatedEvent;

-        public RendererHost Renderer { get; }
-        public VirtualFileSystem VirtualFileSystem { get; }
-        public ContentManager ContentManager { get; }
-        public Switch Device { get; set; }
-        public NpadManager NpadManager { get; }
+        public RendererHost       Renderer           { get; }
+        public VirtualFileSystem  VirtualFileSystem  { get; }
+        public ContentManager     ContentManager     { get; }
+        public NpadManager        NpadManager        { get; }
        public TouchScreenManager TouchScreenManager { get; }
+        public Switch             Device             { get; set; }

-        public int Width { get; private set; }
-        public int Height { get; private set; }
-        public string ApplicationPath { get; private set; }
+        public int    Width               { get; private set; }
+        public int    Height              { get; private set; }
+        public string ApplicationPath     { get; private set; }
+        public bool   ScreenshotRequested { get; set; }

-        private bool _isFirmwareTitle;
-
-        public bool ScreenshotRequested { get; set; }
-
-        private object _lockObject = new();
-        private TopLevel _topLevel;

        public AppHost(
-            RendererHost renderer,
-            InputManager inputManager,
-            string applicationPath,
-            VirtualFileSystem virtualFileSystem,
-            ContentManager contentManager,
-            AccountManager accountManager,
+            RendererHost           renderer,
+            InputManager           inputManager,
+            string                 applicationPath,
+            VirtualFileSystem      virtualFileSystem,
+            ContentManager         contentManager,
+            AccountManager         accountManager,
            UserChannelPersistence userChannelPersistence,
-            MainWindowViewModel viewmodel,
-            TopLevel topLevel)
+            MainWindowViewModel    viewmodel,
+            TopLevel               topLevel)
        {
-            _viewModel = viewmodel;
-            _inputManager = inputManager;
-            _accountManager = accountManager;
+            _viewModel              = viewmodel;
+            _inputManager           = inputManager;
+            _accountManager         = accountManager;
            _userChannelPersistence = userChannelPersistence;
-            _renderingThread = new Thread(RenderLoop, 1 * 1024 * 1024) { Name = "GUI.RenderThread" };
-            _hideCursorOnIdle = ConfigurationState.Instance.HideCursorOnIdle;
-            _lastCursorMoveTime = Stopwatch.GetTimestamp();
-            _glLogLevel = ConfigurationState.Instance.Logger.GraphicsDebugLevel;
-            _topLevel = topLevel;
+            _renderingThread        = new Thread(RenderLoop, 1 * 1024 * 1024) { Name = "GUI.RenderThread" };
+            _hideCursorOnIdle       = ConfigurationState.Instance.HideCursorOnIdle;
+            _lastCursorMoveTime     = Stopwatch.GetTimestamp();
+            _glLogLevel             = ConfigurationState.Instance.Logger.GraphicsDebugLevel;
+            _topLevel               = topLevel;
+
            _inputManager.SetMouseDriver(new AvaloniaMouseDriver(_topLevel, renderer));
+
            _keyboardInterface = (IKeyboard)_inputManager.KeyboardDriver.GetGamepad("0");

-            NpadManager = _inputManager.CreateNpadManager();
+            NpadManager        = _inputManager.CreateNpadManager();
            TouchScreenManager = _inputManager.CreateTouchScreenManager();
-            Renderer = renderer;
-            ApplicationPath = applicationPath;
-            VirtualFileSystem = virtualFileSystem;
-            ContentManager = contentManager;
+            Renderer           = renderer;
+            ApplicationPath    = applicationPath;
+            VirtualFileSystem  = virtualFileSystem;
+            ContentManager     = contentManager;

-            _chrono = new Stopwatch();
+            _chrono        = new Stopwatch();
            _ticksPerFrame = Stopwatch.Frequency / TargetFps;

            if (ApplicationPath.StartsWith("@SystemContent"))
@@ -161,9 +163,9 @@ namespace Ryujinx.Ava
            _topLevel.PointerMoved += TopLevel_PointerMoved;

            ConfigurationState.Instance.System.IgnoreMissingServices.Event += UpdateIgnoreMissingServicesState;
-            ConfigurationState.Instance.Graphics.AspectRatio.Event += UpdateAspectRatioState;
-            ConfigurationState.Instance.System.EnableDockedMode.Event += UpdateDockedModeState;
-            ConfigurationState.Instance.System.AudioVolume.Event += UpdateAudioVolumeState;
+            ConfigurationState.Instance.Graphics.AspectRatio.Event         += UpdateAspectRatioState;
+            ConfigurationState.Instance.System.EnableDockedMode.Event      += UpdateDockedModeState;
+            ConfigurationState.Instance.System.AudioVolume.Event           += UpdateAudioVolumeState;

            _gpuCancellationTokenSource = new CancellationTokenSource();
        }
@@ -173,15 +175,17 @@ namespace Ryujinx.Ava
            if (sender is Control visual)
            {
                _lastCursorMoveTime = Stopwatch.GetTimestamp();
+
                var point = e.GetCurrentPoint(visual).Position;
-                _isMouseInRenderer = Equals(visual.InputHitTest(point), Renderer);
+
+                _isCursorInRenderer = Equals(visual.InputHitTest(point), Renderer);
            }
        }

        private void TopLevel_PointerLeave(object sender, PointerEventArgs e)
        {
-            _isMouseInRenderer = false;
-            _viewModel.Cursor = Cursor.Default;
+            _isCursorInRenderer = false;
+            _viewModel.Cursor   = Cursor.Default;
        }

        private void SetRendererWindowSize(Size size)
@@ -189,6 +193,7 @@ namespace Ryujinx.Ava
            if (_renderer != null)
            {
                double scale = _topLevel.PlatformImpl.RenderScaling;
+
                _renderer.Window?.SetSize((int)(size.Width * scale), (int)(size.Height * scale));
            }
        }
@@ -201,12 +206,13 @@ namespace Ryujinx.Ava
                {
                    lock (_lockObject)
                    {
-                        var currentTime = DateTime.Now;
-                        string filename = $"ryujinx_capture_{currentTime.Year}-{currentTime.Month:D2}-{currentTime.Day:D2}_{currentTime.Hour:D2}-{currentTime.Minute:D2}-{currentTime.Second:D2}.png";
+                        DateTime currentTime = DateTime.Now;
+                        string   filename    = $"ryujinx_capture_{currentTime}-{currentTime:D2}-{currentTime:D2}_{currentTime:D2}-{currentTime:D2}-{currentTime:D2}.png";
+                        
                        string directory = AppDataManager.Mode switch
                        {
                            AppDataManager.LaunchMode.Portable => Path.Combine(AppDataManager.BaseDirPath, "screenshots"),
-                            _ => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyPictures), "Ryujinx")
+                            _                                  => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyPictures), "Ryujinx")
                        };

                        string path = Path.Combine(directory, filename);
@@ -266,21 +272,10 @@ namespace Ryujinx.Ava

            _viewModel.IsGameRunning = true;

-            string titleNameSection = string.IsNullOrWhiteSpace(Device.Application.TitleName)
-                ? string.Empty
-                : $" - {Device.Application.TitleName}";
-
-            string titleVersionSection = string.IsNullOrWhiteSpace(Device.Application.DisplayVersion)
-                ? string.Empty
-                : $" v{Device.Application.DisplayVersion}";
-
-            string titleIdSection = string.IsNullOrWhiteSpace(Device.Application.TitleIdText)
-                ? string.Empty
-                : $" ({Device.Application.TitleIdText.ToUpper()})";
-
-            string titleArchSection = Device.Application.TitleIs64Bit
-                ? " (64-bit)"
-                : " (32-bit)";
+            string titleNameSection    = string.IsNullOrWhiteSpace(Device.Application.TitleName)      ? string.Empty : $" - {Device.Application.TitleName}";
+            string titleVersionSection = string.IsNullOrWhiteSpace(Device.Application.DisplayVersion) ? string.Empty : $" v{Device.Application.DisplayVersion}";
+            string titleIdSection      = string.IsNullOrWhiteSpace(Device.Application.TitleIdText)    ? string.Empty : $" ({Device.Application.TitleIdText.ToUpper()})";
+            string titleArchSection    = Device.Application.TitleIs64Bit                              ? " (64-bit)"  : " (32-bit)";

            Dispatcher.UIThread.InvokeAsync(() =>
            {
@@ -326,9 +321,9 @@ namespace Ryujinx.Ava
        private void UpdateAudioVolumeState(object sender, ReactiveEventArgs<float> e)
        {
            Device?.SetVolume(e.NewValue);
+
            Dispatcher.UIThread.Post(() =>
            {
-                var value = e.NewValue;
                _viewModel.Volume = e.NewValue;
            });
        }
@@ -348,7 +343,7 @@ namespace Ryujinx.Ava
            }

            _isStopped = true;
-            _isActive = false;
+            _isActive  = false;
        }

        public void DisposeContext()
@@ -381,9 +376,9 @@ namespace Ryujinx.Ava
            }

            ConfigurationState.Instance.System.IgnoreMissingServices.Event -= UpdateIgnoreMissingServicesState;
-            ConfigurationState.Instance.Graphics.AspectRatio.Event -= UpdateAspectRatioState;
-            ConfigurationState.Instance.System.EnableDockedMode.Event -= UpdateDockedModeState;
-            ConfigurationState.Instance.System.AudioVolume.Event -= UpdateAudioVolumeState;
+            ConfigurationState.Instance.Graphics.AspectRatio.Event         -= UpdateAspectRatioState;
+            ConfigurationState.Instance.System.EnableDockedMode.Event      -= UpdateDockedModeState;
+            ConfigurationState.Instance.System.AudioVolume.Event           -= UpdateAudioVolumeState;

            _topLevel.PointerLeave -= TopLevel_PointerLeave;
            _topLevel.PointerMoved -= TopLevel_PointerMoved;
@@ -597,19 +592,23 @@ namespace Ryujinx.Ava
        internal void Resume()
        {
            Device?.System.TogglePauseEmulation(false);
+
            _viewModel.IsPaused = false;
        }

        internal void Pause()
        {
            Device?.System.TogglePauseEmulation(true);
+
            _viewModel.IsPaused = true;
        }

        private void InitializeSwitchInstance()
        {
+            // Initialize KeySet.
            VirtualFileSystem.ReloadKeySet();

+            // Initialize Renderer.
            IRenderer renderer;

            if (Renderer.IsVulkan)
@@ -623,12 +622,9 @@ namespace Ryujinx.Ava
                renderer = new OpenGLRenderer();
            }

-            IHardwareDeviceDriver deviceDriver = new DummyHardwareDeviceDriver();
-
            BackendThreading threadingMode = ConfigurationState.Instance.Graphics.BackendThreading;

            var isGALthreaded = threadingMode == BackendThreading.On || (threadingMode == BackendThreading.Auto && renderer.PreferThreading);
-
            if (isGALthreaded)
            {
                renderer = new ThreadedRenderer(renderer);
@@ -636,159 +632,104 @@ namespace Ryujinx.Ava

            Logger.Info?.PrintMsg(LogClass.Gpu, $"Backend Threading ({threadingMode}): {isGALthreaded}");

-            if (ConfigurationState.Instance.System.AudioBackend.Value == AudioBackend.SDL2)
-            {
-                if (SDL2HardwareDeviceDriver.IsSupported)
-                {
-                    deviceDriver = new SDL2HardwareDeviceDriver();
-                }
-                else
-                {
-                    Logger.Warning?.Print(LogClass.Audio, "SDL2 is not supported, trying to fall back to OpenAL.");
-
-                    if (OpenALHardwareDeviceDriver.IsSupported)
-                    {
-                        Logger.Warning?.Print(LogClass.Audio, "Found OpenAL, changing configuration.");
-
-                        ConfigurationState.Instance.System.AudioBackend.Value = AudioBackend.OpenAl;
-                        MainWindowViewModel.SaveConfig();
-
-                        deviceDriver = new OpenALHardwareDeviceDriver();
-                    }
-                    else
-                    {
-                        Logger.Warning?.Print(LogClass.Audio, "OpenAL is not supported, trying to fall back to SoundIO.");
-
-                        if (SoundIoHardwareDeviceDriver.IsSupported)
-                        {
-                            Logger.Warning?.Print(LogClass.Audio, "Found SoundIO, changing configuration.");
-
-                            ConfigurationState.Instance.System.AudioBackend.Value = AudioBackend.SoundIo;
-                            MainWindowViewModel.SaveConfig();
-
-                            deviceDriver = new SoundIoHardwareDeviceDriver();
-                        }
-                        else
-                        {
-                            Logger.Warning?.Print(LogClass.Audio, "SoundIO is not supported, falling back to dummy audio out.");
-                        }
-                    }
-                }
-            }
-            else if (ConfigurationState.Instance.System.AudioBackend.Value == AudioBackend.SoundIo)
-            {
-                if (SoundIoHardwareDeviceDriver.IsSupported)
-                {
-                    deviceDriver = new SoundIoHardwareDeviceDriver();
-                }
-                else
-                {
-                    Logger.Warning?.Print(LogClass.Audio, "SoundIO is not supported, trying to fall back to SDL2.");
-
-                    if (SDL2HardwareDeviceDriver.IsSupported)
-                    {
-                        Logger.Warning?.Print(LogClass.Audio, "Found SDL2, changing configuration.");
-
-                        ConfigurationState.Instance.System.AudioBackend.Value = AudioBackend.SDL2;
-                        MainWindowViewModel.SaveConfig();
-
-                        deviceDriver = new SDL2HardwareDeviceDriver();
-                    }
-                    else
-                    {
-                        Logger.Warning?.Print(LogClass.Audio, "SDL2 is not supported, trying to fall back to OpenAL.");
-
-                        if (OpenALHardwareDeviceDriver.IsSupported)
-                        {
-                            Logger.Warning?.Print(LogClass.Audio, "Found OpenAL, changing configuration.");
-
-                            ConfigurationState.Instance.System.AudioBackend.Value = AudioBackend.OpenAl;
-                            MainWindowViewModel.SaveConfig();
-
-                            deviceDriver = new OpenALHardwareDeviceDriver();
-                        }
-                        else
-                        {
-                            Logger.Warning?.Print(LogClass.Audio, "OpenAL is not supported, falling back to dummy audio out.");
-                        }
-                    }
-                }
-            }
-            else if (ConfigurationState.Instance.System.AudioBackend.Value == AudioBackend.OpenAl)
-            {
-                if (OpenALHardwareDeviceDriver.IsSupported)
-                {
-                    deviceDriver = new OpenALHardwareDeviceDriver();
-                }
-                else
-                {
-                    Logger.Warning?.Print(LogClass.Audio, "OpenAL is not supported, trying to fall back to SDL2.");
-
-                    if (SDL2HardwareDeviceDriver.IsSupported)
-                    {
-                        Logger.Warning?.Print(LogClass.Audio, "Found SDL2, changing configuration.");
-
-                        ConfigurationState.Instance.System.AudioBackend.Value = AudioBackend.SDL2;
-                        MainWindowViewModel.SaveConfig();
-
-                        deviceDriver = new SDL2HardwareDeviceDriver();
-                    }
-                    else
-                    {
-                        Logger.Warning?.Print(LogClass.Audio, "SDL2 is not supported, trying to fall back to SoundIO.");
-
-                        if (SoundIoHardwareDeviceDriver.IsSupported)
-                        {
-                            Logger.Warning?.Print(LogClass.Audio, "Found SoundIO, changing configuration.");
-
-                            ConfigurationState.Instance.System.AudioBackend.Value = AudioBackend.SoundIo;
-                            MainWindowViewModel.SaveConfig();
-
-                            deviceDriver = new SoundIoHardwareDeviceDriver();
-                        }
-                        else
-                        {
-                            Logger.Warning?.Print(LogClass.Audio, "SoundIO is not supported, falling back to dummy audio out.");
-                        }
-                    }
-                }
-            }
-
+            // Initialize Configuration.
            var memoryConfiguration = ConfigurationState.Instance.System.ExpandRam.Value ? HLE.MemoryConfiguration.MemoryConfiguration6GiB : HLE.MemoryConfiguration.MemoryConfiguration4GiB;

-            IntegrityCheckLevel fsIntegrityCheckLevel = ConfigurationState.Instance.System.EnableFsIntegrityChecks ? IntegrityCheckLevel.ErrorOnInvalid : IntegrityCheckLevel.None;
-
-            HLE.HLEConfiguration configuration = new HLE.HLEConfiguration(VirtualFileSystem,
-                                                                          _viewModel.LibHacHorizonManager,
-                                                                          ContentManager,
-                                                                          _accountManager,
-                                                                          _userChannelPersistence,
-                                                                          renderer,
-                                                                          deviceDriver,
-                                                                          memoryConfiguration,
-                                                                          _viewModel.UiHandler,
-                                                                          (SystemLanguage)ConfigurationState.Instance.System.Language.Value,
-                                                                          (RegionCode)ConfigurationState.Instance.System.Region.Value,
-                                                                          ConfigurationState.Instance.Graphics.EnableVsync,
-                                                                          ConfigurationState.Instance.System.EnableDockedMode,
-                                                                          ConfigurationState.Instance.System.EnablePtc,
-                                                                          ConfigurationState.Instance.System.EnableInternetAccess,
-                                                                          fsIntegrityCheckLevel,
-                                                                          ConfigurationState.Instance.System.FsGlobalAccessLogMode,
-                                                                          ConfigurationState.Instance.System.SystemTimeOffset,
-                                                                          ConfigurationState.Instance.System.TimeZone,
-                                                                          ConfigurationState.Instance.System.MemoryManagerMode,
-                                                                          ConfigurationState.Instance.System.IgnoreMissingServices,
-                                                                          ConfigurationState.Instance.Graphics.AspectRatio,
-                                                                          ConfigurationState.Instance.System.AudioVolume);
+            HLE.HLEConfiguration configuration = new(VirtualFileSystem,
+                                                     _viewModel.LibHacHorizonManager,
+                                                     ContentManager,
+                                                     _accountManager,
+                                                     _userChannelPersistence,
+                                                     renderer,
+                                                     InitializeAudio(),
+                                                     memoryConfiguration,
+                                                     _viewModel.UiHandler,
+                                                     (SystemLanguage)ConfigurationState.Instance.System.Language.Value,
+                                                     (RegionCode)ConfigurationState.Instance.System.Region.Value,
+                                                     ConfigurationState.Instance.Graphics.EnableVsync,
+                                                     ConfigurationState.Instance.System.EnableDockedMode,
+                                                     ConfigurationState.Instance.System.EnablePtc,
+                                                     ConfigurationState.Instance.System.EnableInternetAccess,
+                                                     ConfigurationState.Instance.System.EnableFsIntegrityChecks ? IntegrityCheckLevel.ErrorOnInvalid : IntegrityCheckLevel.None,
+                                                     ConfigurationState.Instance.System.FsGlobalAccessLogMode,
+                                                     ConfigurationState.Instance.System.SystemTimeOffset,
+                                                     ConfigurationState.Instance.System.TimeZone,
+                                                     ConfigurationState.Instance.System.MemoryManagerMode,
+                                                     ConfigurationState.Instance.System.IgnoreMissingServices,
+                                                     ConfigurationState.Instance.Graphics.AspectRatio,
+                                                     ConfigurationState.Instance.System.AudioVolume);

            Device = new Switch(configuration);
        }

+        private static IHardwareDeviceDriver InitializeAudio()
+        {
+            var availableBackends = new List<AudioBackend>()
+            {
+                AudioBackend.SDL2,
+                AudioBackend.SoundIo,
+                AudioBackend.OpenAl,
+                AudioBackend.Dummy
+            };
+
+            AudioBackend preferredBackend = ConfigurationState.Instance.System.AudioBackend.Value;
+
+            for (int i = 0; i < availableBackends.Count; i++)
+            {
+                if (availableBackends[i] == preferredBackend)
+                {
+                    availableBackends.RemoveAt(i);
+                    availableBackends.Insert(0, preferredBackend);
+                    break;
+                }
+            }
+
+            static IHardwareDeviceDriver InitializeAudioBackend<T>(AudioBackend backend, AudioBackend nextBackend) where T : IHardwareDeviceDriver, new()
+            {
+                if (T.IsSupported)
+                {
+                    return new T();
+                }
+                else
+                {
+                    Logger.Warning?.Print(LogClass.Audio, $"{backend} is not supported, falling back to {nextBackend}.");
+
+                    return null;
+                }
+            }
+
+            IHardwareDeviceDriver deviceDriver = null;
+
+            for (int i = 0; i < availableBackends.Count; i++)
+            {
+                AudioBackend currentBackend = availableBackends[i];
+                AudioBackend nextBackend    = i + 1 < availableBackends.Count ? availableBackends[i + 1] : AudioBackend.Dummy;
+
+                deviceDriver = currentBackend switch
+                {
+                    AudioBackend.SDL2    => InitializeAudioBackend<SDL2HardwareDeviceDriver>(AudioBackend.SDL2, nextBackend),
+                    AudioBackend.SoundIo => InitializeAudioBackend<SoundIoHardwareDeviceDriver>(AudioBackend.SoundIo, nextBackend),
+                    AudioBackend.OpenAl  => InitializeAudioBackend<OpenALHardwareDeviceDriver>(AudioBackend.OpenAl, nextBackend),
+                    _                    => new DummyHardwareDeviceDriver()
+                };
+
+                if (deviceDriver != null)
+                {
+                    ConfigurationState.Instance.System.AudioBackend.Value = currentBackend;
+                    break;
+                }
+            }
+
+            MainWindowViewModel.SaveConfig();
+
+            return deviceDriver;
+        }
+
        private void Window_SizeChanged(object sender, Size e)
        {
-            Width = (int)e.Width;
+            Width  = (int)e.Width;
            Height = (int)e.Height;
+
            SetRendererWindowSize(e);
        }

@@ -798,7 +739,7 @@ namespace Ryujinx.Ava
            {
                UpdateFrame();

-                // Polling becomes expensive if it's not slept
+                // Polling becomes expensive if it's not slept.
                Thread.Sleep(1);
            }
        }
@@ -818,14 +759,7 @@ namespace Ryujinx.Ava
                }
            });

-            IRenderer renderer = Device.Gpu.Renderer;
-
-            if (renderer is ThreadedRenderer tr)
-            {
-                renderer = tr.BaseRenderer;
-            }
-
-            _renderer = renderer;
+            _renderer = Device.Gpu.Renderer is ThreadedRenderer tr ? tr.BaseRenderer : Device.Gpu.Renderer;

            _renderer.ScreenCaptured += Renderer_ScreenCaptured;

@@ -884,13 +818,12 @@ namespace Ryujinx.Ava

        public void UpdateStatus()
        {
-            // Run a status update only when a frame is to be drawn. This prevents from updating the ui and wasting a render when no frame is queued
+            // Run a status update only when a frame is to be drawn. This prevents from updating the ui and wasting a render when no frame is queued.
            string dockedMode = ConfigurationState.Instance.System.EnableDockedMode ? LocaleManager.Instance[LocaleKeys.Docked] : LocaleManager.Instance[LocaleKeys.Handheld];
-            float scale = GraphicsConfig.ResScale;
-
-            if (scale != 1)
+            
+            if (GraphicsConfig.ResScale != 1)
            {
-                dockedMode += $" ({scale}x)";
+                dockedMode += $" ({GraphicsConfig.ResScale}x)";
            }

            StatusUpdatedEvent?.Invoke(this, new StatusUpdatedEventArgs(
@@ -907,7 +840,6 @@ namespace Ryujinx.Ava
        public async Task ShowExitPrompt()
        {
            bool shouldExit = !ConfigurationState.Instance.ShowConfirmExit;
-
            if (!shouldExit)
            {
                if (_dialogShown)
@@ -916,6 +848,7 @@ namespace Ryujinx.Ava
                }

                _dialogShown = true;
+
                shouldExit = await ContentDialogHelper.CreateStopEmulationDialog();

                _dialogShown = false;
@@ -933,7 +866,7 @@ namespace Ryujinx.Ava
            {
                Dispatcher.UIThread.Post(() =>
                {
-                    _viewModel.Cursor = _isMouseInRenderer ? InvisibleCursor : Cursor.Default;
+                    _viewModel.Cursor = _isCursorInRenderer ? InvisibleCursor : Cursor.Default;
                });
            }
            else
@@ -1046,7 +979,7 @@ namespace Ryujinx.Ava
                }
            }

-            // Touchscreen
+            // Touchscreen.
            bool hasTouch = false;

            if (_viewModel.IsActive && !ConfigurationState.Instance.Hid.EnableMouse)
--- a/Ryujinx.Ava/Assets/Locales/de_DE.json
+++ b/Ryujinx.Ava/Assets/Locales/de_DE.json
@@ -41,10 +41,10 @@
  "GameListHeaderPath": "Pfad",
  "GameListContextMenuOpenUserSaveDirectory": "Spielstand-Verzeichnis öffnen",
  "GameListContextMenuOpenUserSaveDirectoryToolTip": "Öffnet das Verzeichnis, welches den Benutzer-Spielstand beinhaltet",
-  "GameListContextMenuOpenUserDeviceDirectory": "Benutzer-Geräte-Verzeichnis öffnen",
-  "GameListContextMenuOpenUserDeviceDirectoryToolTip": "Öffnet das Verzeichnis, welches den Geräte-Spielstände beinhaltet",
-  "GameListContextMenuOpenUserBcatDirectory": "Benutzer-BCAT-Vezeichnis öffnen",
-  "GameListContextMenuOpenUserBcatDirectoryToolTip": "Öffnet das Verzeichnis, welches den BCAT Cache des Spiels beinhaltet",
+  "GameListContextMenuOpenDeviceSaveDirectory": "Benutzer-Geräte-Verzeichnis öffnen",
+  "GameListContextMenuOpenDeviceSaveDirectoryToolTip": "Öffnet das Verzeichnis, welches den Geräte-Spielstände beinhaltet",
+  "GameListContextMenuOpenBcatSaveDirectory": "Benutzer-BCAT-Vezeichnis öffnen",
+  "GameListContextMenuOpenBcatSaveDirectoryToolTip": "Öffnet das Verzeichnis, welches den BCAT Cache des Spiels beinhaltet",
  "GameListContextMenuManageTitleUpdates": "Verwalten von Spiel Updates",
  "GameListContextMenuManageTitleUpdatesToolTip": "Öffnet den Spiel-Update-Manager",
  "GameListContextMenuManageDlc": "Verwalten von DLC",
@@ -610,4 +610,4 @@
  "UserProfilesRecoverLostAccounts": "Konto wiederherstellen",
  "Recover": "Wiederherstellen",
  "UserProfilesRecoverHeading": "Speicherstände wurden für die folgenden Konten gefunden"
-}
+}
--- a/Ryujinx.Ava/Assets/Locales/el_GR.json
+++ b/Ryujinx.Ava/Assets/Locales/el_GR.json
@@ -41,10 +41,10 @@
  "GameListHeaderPath": "Τοποθεσία",
  "GameListContextMenuOpenUserSaveDirectory": "Άνοιγμα Τοποθεσίας Αποθήκευσης Χρήστη",
  "GameListContextMenuOpenUserSaveDirectoryToolTip": "Ανοίγει την τοποθεσία που περιέχει την Αποθήκευση Χρήστη της εφαρμογής",
-  "GameListContextMenuOpenUserDeviceDirectory": "Άνοιγμα Τοποθεσίας Συσκευής Χρήστη",
-  "GameListContextMenuOpenUserDeviceDirectoryToolTip": "Ανοίγει την τοποθεσία που περιέχει την Αποθήκευση Συσκευής της εφαρμογής",
-  "GameListContextMenuOpenUserBcatDirectory": "Άνοιγμα Τοποθεσίας BCAT",
-  "GameListContextMenuOpenUserBcatDirectoryToolTip": "Ανοίγει την τοποθεσία που περιέχει την Αποθήκευση BCAT της εφαρμογής",
+  "GameListContextMenuOpenDeviceSaveDirectory": "Άνοιγμα Τοποθεσίας Συσκευής Χρήστη",
+  "GameListContextMenuOpenDeviceSaveDirectoryToolTip": "Ανοίγει την τοποθεσία που περιέχει την Αποθήκευση Συσκευής της εφαρμογής",
+  "GameListContextMenuOpenBcatSaveDirectory": "Άνοιγμα Τοποθεσίας BCAT",
+  "GameListContextMenuOpenBcatSaveDirectoryToolTip": "Ανοίγει την τοποθεσία που περιέχει την Αποθήκευση BCAT της εφαρμογής",
  "GameListContextMenuManageTitleUpdates": "Διαχείριση Ενημερώσεων Παιχνιδιού",
  "GameListContextMenuManageTitleUpdatesToolTip": "Ανοίγει το παράθυρο διαχείρισης Ενημερώσεων Παιχνιδιού",
  "GameListContextMenuManageDlc": "Διαχείριση DLC",
@@ -610,4 +610,4 @@
  "UserProfilesRecoverLostAccounts": "Recover Lost Accounts",
  "Recover": "Recover",
  "UserProfilesRecoverHeading": "Saves were found for the following accounts"
-}
+}
--- a/Ryujinx.Ava/Assets/Locales/en_US.json
+++ b/Ryujinx.Ava/Assets/Locales/en_US.json
@@ -41,10 +41,10 @@
  "GameListHeaderPath": "Path",
  "GameListContextMenuOpenUserSaveDirectory": "Open User Save Directory",
  "GameListContextMenuOpenUserSaveDirectoryToolTip": "Opens the directory which contains Application's User Save",
-  "GameListContextMenuOpenUserDeviceDirectory": "Open User Device Directory",
-  "GameListContextMenuOpenUserDeviceDirectoryToolTip": "Opens the directory which contains Application's Device Save",
-  "GameListContextMenuOpenUserBcatDirectory": "Open User BCAT Directory",
-  "GameListContextMenuOpenUserBcatDirectoryToolTip": "Opens the directory which contains Application's BCAT Save",
+  "GameListContextMenuOpenDeviceSaveDirectory": "Open Device Save Directory",
+  "GameListContextMenuOpenDeviceSaveDirectoryToolTip": "Opens the directory which contains Application's Device Save",
+  "GameListContextMenuOpenBcatSaveDirectory": "Open BCAT Save Directory",
+  "GameListContextMenuOpenBcatSaveDirectoryToolTip": "Opens the directory which contains Application's BCAT Save",
  "GameListContextMenuManageTitleUpdates": "Manage Title Updates",
  "GameListContextMenuManageTitleUpdatesToolTip": "Opens the Title Update management window",
  "GameListContextMenuManageDlc": "Manage DLC",
@@ -610,4 +610,4 @@
  "UserProfilesRecoverLostAccounts": "Recover Lost Accounts",
  "Recover": "Recover",
  "UserProfilesRecoverHeading" : "Saves were found for the following accounts"
-}
+}
--- a/Ryujinx.Ava/Assets/Locales/es_ES.json
+++ b/Ryujinx.Ava/Assets/Locales/es_ES.json
@@ -41,10 +41,10 @@
  "GameListHeaderPath": "Directorio",
  "GameListContextMenuOpenUserSaveDirectory": "Abrir carpeta de guardado de este usuario",
  "GameListContextMenuOpenUserSaveDirectoryToolTip": "Abre la carpeta que contiene la partida guardada del usuario para esta aplicación",
-  "GameListContextMenuOpenUserDeviceDirectory": "Abrir carpeta de guardado del sistema para el usuario actual",
-  "GameListContextMenuOpenUserDeviceDirectoryToolTip": "Abre la carpeta que contiene la partida guardada del sistema para esta aplicación",
-  "GameListContextMenuOpenUserBcatDirectory": "Abrir carpeta de guardado BCAT del usuario",
-  "GameListContextMenuOpenUserBcatDirectoryToolTip": "Abrir la carpeta que contiene el guardado BCAT de esta aplicación",
+  "GameListContextMenuOpenDeviceSaveDirectory": "Abrir carpeta de guardado del sistema para el usuario actual",
+  "GameListContextMenuOpenDeviceSaveDirectoryToolTip": "Abre la carpeta que contiene la partida guardada del sistema para esta aplicación",
+  "GameListContextMenuOpenBcatSaveDirectory": "Abrir carpeta de guardado BCAT del usuario",
+  "GameListContextMenuOpenBcatSaveDirectoryToolTip": "Abrir la carpeta que contiene el guardado BCAT de esta aplicación",
  "GameListContextMenuManageTitleUpdates": "Gestionar actualizaciones del juego",
  "GameListContextMenuManageTitleUpdatesToolTip": "Abrir la ventana de gestión de actualizaciones de esta aplicación",
  "GameListContextMenuManageDlc": "Gestionar DLC",
@@ -610,4 +610,4 @@
  "UserProfilesRecoverLostAccounts": "Recover Lost Accounts",
  "Recover": "Recover",
  "UserProfilesRecoverHeading": "Saves were found for the following accounts"
-}
+}
--- a/Ryujinx.Ava/Assets/Locales/fr_FR.json
+++ b/Ryujinx.Ava/Assets/Locales/fr_FR.json
@@ -41,10 +41,10 @@
  "GameListHeaderPath": "Chemin",
  "GameListContextMenuOpenUserSaveDirectory": "Ouvrir le dossier de sauvegarde utilisateur",
  "GameListContextMenuOpenUserSaveDirectoryToolTip": "Ouvre le dossier contenant la sauvegarde utilisateur du jeu",
-  "GameListContextMenuOpenUserDeviceDirectory": "Ouvrir le dossier de sauvegarde console",
-  "GameListContextMenuOpenUserDeviceDirectoryToolTip": "Ouvre le dossier contenant la sauvegarde console du jeu",
-  "GameListContextMenuOpenUserBcatDirectory": "Ouvrir le dossier de sauvegarde BCAT",
-  "GameListContextMenuOpenUserBcatDirectoryToolTip": "Ouvre le dossier contenant la sauvegarde BCAT du jeu",
+  "GameListContextMenuOpenDeviceSaveDirectory": "Ouvrir le dossier de sauvegarde console",
+  "GameListContextMenuOpenDeviceSaveDirectoryToolTip": "Ouvre le dossier contenant la sauvegarde console du jeu",
+  "GameListContextMenuOpenBcatSaveDirectory": "Ouvrir le dossier de sauvegarde BCAT",
+  "GameListContextMenuOpenBcatSaveDirectoryToolTip": "Ouvre le dossier contenant la sauvegarde BCAT du jeu",
  "GameListContextMenuManageTitleUpdates": "Gérer les mises à jour",
  "GameListContextMenuManageTitleUpdatesToolTip": "Ouvre la fenêtre de gestion des mises à jour",
  "GameListContextMenuManageDlc": "Gérer les DLC",
@@ -610,4 +610,4 @@
  "UserProfilesRecoverLostAccounts": "Récupérer les comptes perdus",
  "Recover": "Récupérer",
  "UserProfilesRecoverHeading": "Des sauvegardes ont été trouvées pour les comptes suivants"
-}
+}
--- a/Ryujinx.Ava/Assets/Locales/it_IT.json
+++ b/Ryujinx.Ava/Assets/Locales/it_IT.json
@@ -41,10 +41,10 @@
  "GameListHeaderPath": "Percorso",
  "GameListContextMenuOpenUserSaveDirectory": "Apri la cartella salvataggi dell'utente",
  "GameListContextMenuOpenUserSaveDirectoryToolTip": "Apre la cartella che contiene i salvataggi di gioco dell'utente",
-  "GameListContextMenuOpenUserDeviceDirectory": "Apri la cartella dispositivo dell'utente",
-  "GameListContextMenuOpenUserDeviceDirectoryToolTip": "Apre la cartella che contiene i salvataggi di gioco del dispositivo",
-  "GameListContextMenuOpenUserBcatDirectory": "Apri la cartella BCAT dell'utente",
-  "GameListContextMenuOpenUserBcatDirectoryToolTip": "Apre la cartella che contiene i salvataggi BCAT dell'applicazione",
+  "GameListContextMenuOpenDeviceSaveDirectory": "Apri la cartella dispositivo dell'utente",
+  "GameListContextMenuOpenDeviceSaveDirectoryToolTip": "Apre la cartella che contiene i salvataggi di gioco del dispositivo",
+  "GameListContextMenuOpenBcatSaveDirectory": "Apri la cartella BCAT dell'utente",
+  "GameListContextMenuOpenBcatSaveDirectoryToolTip": "Apre la cartella che contiene i salvataggi BCAT dell'applicazione",
  "GameListContextMenuManageTitleUpdates": "Gestisci aggiornamenti del gioco",
  "GameListContextMenuManageTitleUpdatesToolTip": "Apre la finestra di gestione aggiornamenti del gioco",
  "GameListContextMenuManageDlc": "Gestici DLC",
@@ -610,4 +610,4 @@
  "UserProfilesRecoverLostAccounts": "Recupera il tuo account",
  "Recover": "Recupera",
  "UserProfilesRecoverHeading": "Sono stati trovati dei salvataggi per i seguenti account"
-}
+}
--- a/Ryujinx.Ava/Assets/Locales/ja_JP.json
+++ b/Ryujinx.Ava/Assets/Locales/ja_JP.json
@@ -41,10 +41,10 @@
  "GameListHeaderPath": "パス",
  "GameListContextMenuOpenUserSaveDirectory": "セーブディレクトリを開く",
  "GameListContextMenuOpenUserSaveDirectoryToolTip": "アプリケーションのユーザセーブデータを格納するディレクトリを開きます",
-  "GameListContextMenuOpenUserDeviceDirectory": "デバイスディレクトリを開く",
-  "GameListContextMenuOpenUserDeviceDirectoryToolTip": "アプリケーションのデバイスセーブデータを格納するディレクトリを開きます",
-  "GameListContextMenuOpenUserBcatDirectory": "BCATディレクトリを開く",
-  "GameListContextMenuOpenUserBcatDirectoryToolTip": "アプリケーションの BCAT セーブデータを格納するディレクトリを開きます",
+  "GameListContextMenuOpenDeviceSaveDirectory": "デバイスディレクトリを開く",
+  "GameListContextMenuOpenDeviceSaveDirectoryToolTip": "アプリケーションのデバイスセーブデータを格納するディレクトリを開きます",
+  "GameListContextMenuOpenBcatSaveDirectory": "BCATディレクトリを開く",
+  "GameListContextMenuOpenBcatSaveDirectoryToolTip": "アプリケーションの BCAT セーブデータを格納するディレクトリを開きます",
  "GameListContextMenuManageTitleUpdates": "アップデートを管理",
  "GameListContextMenuManageTitleUpdatesToolTip": "タイトルのアップデート管理ウインドウを開きます",
  "GameListContextMenuManageDlc": "DLCを管理",
@@ -610,4 +610,4 @@
  "UserProfilesRecoverLostAccounts": "アカウントの復旧",
  "Recover": "復旧",
  "UserProfilesRecoverHeading": "以下のアカウントのセーブデータが見つかりました"
-}
+}
--- a/Ryujinx.Ava/Assets/Locales/ko_KR.json
+++ b/Ryujinx.Ava/Assets/Locales/ko_KR.json
@@ -41,10 +41,10 @@
  "GameListHeaderPath": "경로",
  "GameListContextMenuOpenUserSaveDirectory": "사용자 저장 디렉토리 열기\n",
  "GameListContextMenuOpenUserSaveDirectoryToolTip": "응용 프로그램의 사용자 저장이 포함된 디렉토리 열기\n",
-  "GameListContextMenuOpenUserDeviceDirectory": "사용자 장치 디렉토리 열기",
-  "GameListContextMenuOpenUserDeviceDirectoryToolTip": "응용 프로그램의 장치 저장이 포함된 디렉토리 열기\n",
-  "GameListContextMenuOpenUserBcatDirectory": "사용자의 BCAT 디렉토리 열기\n",
-  "GameListContextMenuOpenUserBcatDirectoryToolTip": "응용 프로그램의 BCAT 저장이 포함된 디렉토리 열기\n",
+  "GameListContextMenuOpenDeviceSaveDirectory": "사용자 장치 디렉토리 열기",
+  "GameListContextMenuOpenDeviceSaveDirectoryToolTip": "응용 프로그램의 장치 저장이 포함된 디렉토리 열기\n",
+  "GameListContextMenuOpenBcatSaveDirectory": "사용자의 BCAT 디렉토리 열기\n",
+  "GameListContextMenuOpenBcatSaveDirectoryToolTip": "응용 프로그램의 BCAT 저장이 포함된 디렉토리 열기\n",
  "GameListContextMenuManageTitleUpdates": "타이틀 업데이트 관리\n",
  "GameListContextMenuManageTitleUpdatesToolTip": "타이틀 업데이트 관리 창 열기",
  "GameListContextMenuManageDlc": "DLC 관리",
@@ -610,4 +610,4 @@
  "UserProfilesRecoverLostAccounts": "잃어버린 계정 복구",
  "Recover": "복구",
  "UserProfilesRecoverHeading": "다음 계정에 대한 저장 발견"
-}
+}
--- a/Ryujinx.Ava/Assets/Locales/pl_PL.json
+++ b/Ryujinx.Ava/Assets/Locales/pl_PL.json
@@ -41,10 +41,10 @@
  "GameListHeaderPath": "Ścieżka",
  "GameListContextMenuOpenUserSaveDirectory": "Otwórz Katalog Zapisów Użytkownika",
  "GameListContextMenuOpenUserSaveDirectoryToolTip": "Otwiera katalog, który zawiera Zapis Użytkownika Aplikacji",
-  "GameListContextMenuOpenUserDeviceDirectory": "Otwórz Katalog Urządzeń Użytkownika",
-  "GameListContextMenuOpenUserDeviceDirectoryToolTip": "Otwiera katalog, który zawiera Zapis Urządzenia Aplikacji",
-  "GameListContextMenuOpenUserBcatDirectory": "Otwórz Katalog BCAT Użytkownika",
-  "GameListContextMenuOpenUserBcatDirectoryToolTip": "Otwiera katalog, który zawiera Zapis BCAT Aplikacji",
+  "GameListContextMenuOpenDeviceSaveDirectory": "Otwórz Katalog Urządzeń Użytkownika",
+  "GameListContextMenuOpenDeviceSaveDirectoryToolTip": "Otwiera katalog, który zawiera Zapis Urządzenia Aplikacji",
+  "GameListContextMenuOpenBcatSaveDirectory": "Otwórz Katalog BCAT Użytkownika",
+  "GameListContextMenuOpenBcatSaveDirectoryToolTip": "Otwiera katalog, który zawiera Zapis BCAT Aplikacji",
  "GameListContextMenuManageTitleUpdates": "Zarządzaj Aktualizacjami Tytułów",
  "GameListContextMenuManageTitleUpdatesToolTip": "Otwiera okno zarządzania Aktualizacjami Tytułu",
  "GameListContextMenuManageDlc": "Zarządzaj DLC",
@@ -610,4 +610,4 @@
  "UserProfilesRecoverLostAccounts": "Odzyskaj Utracone Konta",
  "Recover": "Odzyskaj",
  "UserProfilesRecoverHeading": "Znaleziono zapisy dla następujących kont"
-}
+}
--- a/Ryujinx.Ava/Assets/Locales/pt_BR.json
+++ b/Ryujinx.Ava/Assets/Locales/pt_BR.json
@@ -41,10 +41,10 @@
  "GameListHeaderPath": "Caminho",
  "GameListContextMenuOpenUserSaveDirectory": "Abrir diretório de saves do usuário",
  "GameListContextMenuOpenUserSaveDirectoryToolTip": "Abre o diretório que contém jogos salvos para o usuário atual",
-  "GameListContextMenuOpenUserDeviceDirectory": "Abrir diretório de saves de dispositivo do usuário",
-  "GameListContextMenuOpenUserDeviceDirectoryToolTip": "Abre o diretório que contém saves do dispositivo para o usuário atual",
-  "GameListContextMenuOpenUserBcatDirectory": "Abrir diretório de saves BCAT do usuário",
-  "GameListContextMenuOpenUserBcatDirectoryToolTip": "Abre o diretório que contém saves BCAT para o usuário atual",
+  "GameListContextMenuOpenDeviceSaveDirectory": "Abrir diretório de saves de dispositivo do usuário",
+  "GameListContextMenuOpenDeviceSaveDirectoryToolTip": "Abre o diretório que contém saves do dispositivo para o usuário atual",
+  "GameListContextMenuOpenBcatSaveDirectory": "Abrir diretório de saves BCAT do usuário",
+  "GameListContextMenuOpenBcatSaveDirectoryToolTip": "Abre o diretório que contém saves BCAT para o usuário atual",
  "GameListContextMenuManageTitleUpdates": "Gerenciar atualizações do jogo",
  "GameListContextMenuManageTitleUpdatesToolTip": "Abre a janela de gerenciamento de atualizações",
  "GameListContextMenuManageDlc": "Gerenciar DLCs",
@@ -610,4 +610,4 @@
  "UserProfilesRecoverLostAccounts": "Recuperar contas perdidas",
  "Recover": "Recuperar",
  "UserProfilesRecoverHeading": "Jogos salvos foram encontrados para as seguintes contas"
-}
+}
--- a/Ryujinx.Ava/Assets/Locales/ru_RU.json
+++ b/Ryujinx.Ava/Assets/Locales/ru_RU.json
@@ -41,10 +41,10 @@
  "GameListHeaderPath": "Путь",
  "GameListContextMenuOpenUserSaveDirectory": "Открыть каталог сохранений пользователя",
  "GameListContextMenuOpenUserSaveDirectoryToolTip": "Открывает каталог, содержащий пользовательское сохранение приложения",
-  "GameListContextMenuOpenUserDeviceDirectory": "Открыть каталог пользовательских устройств",
-  "GameListContextMenuOpenUserDeviceDirectoryToolTip": "Открывает каталог, содержащий сохранение устройства приложения",
-  "GameListContextMenuOpenUserBcatDirectory": "Открыть каталог пользователей BCAT",
-  "GameListContextMenuOpenUserBcatDirectoryToolTip": "Открывает каталог, содержащий BCAT сохранения приложения.",
+  "GameListContextMenuOpenDeviceSaveDirectory": "Открыть каталог пользовательских устройств",
+  "GameListContextMenuOpenDeviceSaveDirectoryToolTip": "Открывает каталог, содержащий сохранение устройства приложения",
+  "GameListContextMenuOpenBcatSaveDirectory": "Открыть каталог пользователей BCAT",
+  "GameListContextMenuOpenBcatSaveDirectoryToolTip": "Открывает каталог, содержащий BCAT сохранения приложения.",
  "GameListContextMenuManageTitleUpdates": "Управление обновлениями заголовков",
  "GameListContextMenuManageTitleUpdatesToolTip": "Открывает окно управления обновлением заголовков",
  "GameListContextMenuManageDlc": "Управление DLC",
@@ -610,4 +610,4 @@
  "UserProfilesRecoverLostAccounts": "Recover Lost Accounts",
  "Recover": "Recover",
  "UserProfilesRecoverHeading": "Saves were found for the following accounts"
-}
+}
--- a/Ryujinx.Ava/Assets/Locales/tr_TR.json
+++ b/Ryujinx.Ava/Assets/Locales/tr_TR.json
@@ -41,10 +41,10 @@
  "GameListHeaderPath": "Yol",
  "GameListContextMenuOpenUserSaveDirectory": "Kullanıcı Kayıt Dosyası Dizinini Aç",
  "GameListContextMenuOpenUserSaveDirectoryToolTip": "Uygulamanın Kullanıcı Kaydı'nın bulunduğu dizini açar",
-  "GameListContextMenuOpenUserDeviceDirectory": "Kullanıcı Cihaz Dizinini Aç",
-  "GameListContextMenuOpenUserDeviceDirectoryToolTip": "Uygulamanın Kullanıcı Cihaz Kaydı'nın bulunduğu dizini açar",
-  "GameListContextMenuOpenUserBcatDirectory": "Kullanıcı BCAT Dizinini Aç",
-  "GameListContextMenuOpenUserBcatDirectoryToolTip": "Uygulamanın Kullanıcı BCAT Kaydı'nın bulunduğu dizini açar",
+  "GameListContextMenuOpenDeviceSaveDirectory": "Kullanıcı Cihaz Dizinini Aç",
+  "GameListContextMenuOpenDeviceSaveDirectoryToolTip": "Uygulamanın Kullanıcı Cihaz Kaydı'nın bulunduğu dizini açar",
+  "GameListContextMenuOpenBcatSaveDirectory": "Kullanıcı BCAT Dizinini Aç",
+  "GameListContextMenuOpenBcatSaveDirectoryToolTip": "Uygulamanın Kullanıcı BCAT Kaydı'nın bulunduğu dizini açar",
  "GameListContextMenuManageTitleUpdates": "Oyun Güncellemelerini Yönet",
  "GameListContextMenuManageTitleUpdatesToolTip": "Oyun Güncelleme Yönetim Penceresini Açar",
  "GameListContextMenuManageDlc": "DLC'leri Yönet",
@@ -610,4 +610,4 @@
  "UserProfilesRecoverLostAccounts": "Kayıp Hesapları Kurtar",
  "Recover": "Kurtar",
  "UserProfilesRecoverHeading": "Aşağıdaki hesaplar için kayıtlar bulundu"
-}
+}
--- a/Ryujinx.Ava/Assets/Locales/uk_UA.json
+++ b/Ryujinx.Ava/Assets/Locales/uk_UA.json
@@ -41,10 +41,10 @@
  "GameListHeaderPath": "Шлях",
  "GameListContextMenuOpenUserSaveDirectory": "Відкрити каталог збереження користувача",
  "GameListContextMenuOpenUserSaveDirectoryToolTip": "Відкриває каталог, який містить збереження користувача програми",
-  "GameListContextMenuOpenUserDeviceDirectory": "Відкрити каталог пристроїв користувача",
-  "GameListContextMenuOpenUserDeviceDirectoryToolTip": "Відкриває каталог, який містить збереження пристрою програми",
-  "GameListContextMenuOpenUserBcatDirectory": "Відкрити каталог користувача BCAT",
-  "GameListContextMenuOpenUserBcatDirectoryToolTip": "Відкриває каталог, який містить BCAT-збереження програми",
+  "GameListContextMenuOpenDeviceSaveDirectory": "Відкрити каталог пристроїв користувача",
+  "GameListContextMenuOpenDeviceSaveDirectoryToolTip": "Відкриває каталог, який містить збереження пристрою програми",
+  "GameListContextMenuOpenBcatSaveDirectory": "Відкрити каталог користувача BCAT",
+  "GameListContextMenuOpenBcatSaveDirectoryToolTip": "Відкриває каталог, який містить BCAT-збереження програми",
  "GameListContextMenuManageTitleUpdates": "Керування оновленнями заголовків",
  "GameListContextMenuManageTitleUpdatesToolTip": "Відкриває вікно керування оновленням заголовка",
  "GameListContextMenuManageDlc": "Керування DLC",
@@ -610,4 +610,4 @@
  "UserProfilesRecoverLostAccounts": "Відновлення втрачених облікових записів",
  "Recover": "Відновити",
  "UserProfilesRecoverHeading": "Знайдено збереження для наступних облікових записів"
-}
+}
--- a/Ryujinx.Ava/Assets/Locales/zh_CN.json
+++ b/Ryujinx.Ava/Assets/Locales/zh_CN.json
@@ -41,10 +41,10 @@
  "GameListHeaderPath": "路径",
  "GameListContextMenuOpenUserSaveDirectory": "打开应用存档目录",
  "GameListContextMenuOpenUserSaveDirectoryToolTip": "打开储存游戏存档的目录",
-  "GameListContextMenuOpenUserDeviceDirectory": "打开应用系统目录",
-  "GameListContextMenuOpenUserDeviceDirectoryToolTip": "打开包含游戏系统设置的目录",
-  "GameListContextMenuOpenUserBcatDirectory": "打开 BCAT 目录",
-  "GameListContextMenuOpenUserBcatDirectoryToolTip": "打开包含游戏 BCAT 数据的目录",
+  "GameListContextMenuOpenDeviceSaveDirectory": "打开应用系统目录",
+  "GameListContextMenuOpenDeviceSaveDirectoryToolTip": "打开包含游戏系统设置的目录",
+  "GameListContextMenuOpenBcatSaveDirectory": "打开 BCAT 目录",
+  "GameListContextMenuOpenBcatSaveDirectoryToolTip": "打开包含游戏 BCAT 数据的目录",
  "GameListContextMenuManageTitleUpdates": "管理游戏更新",
  "GameListContextMenuManageTitleUpdatesToolTip": "打开更新管理器",
  "GameListContextMenuManageDlc": "管理 DLC",
@@ -610,4 +610,4 @@
  "UserProfilesRecoverLostAccounts": "恢复丢失的账户",
  "Recover": "恢复",
  "UserProfilesRecoverHeading": "找到了这些用户的存档数据"
-}
+}
--- a/Ryujinx.Ava/Assets/Locales/zh_TW.json
+++ b/Ryujinx.Ava/Assets/Locales/zh_TW.json
@@ -41,10 +41,10 @@
  "GameListHeaderPath": "路徑",
  "GameListContextMenuOpenUserSaveDirectory": "開啟使用者存檔資料夾",
  "GameListContextMenuOpenUserSaveDirectoryToolTip": "開啟儲存遊戲存檔的資料夾",
-  "GameListContextMenuOpenUserDeviceDirectory": "開啟系統資料夾",
-  "GameListContextMenuOpenUserDeviceDirectoryToolTip": "開啟包含遊戲系統設定的資料夾",
-  "GameListContextMenuOpenUserBcatDirectory": "開啟 BCAT 資料夾",
-  "GameListContextMenuOpenUserBcatDirectoryToolTip": "開啟包含遊戲 BCAT 資料的資料夾",
+  "GameListContextMenuOpenDeviceSaveDirectory": "開啟系統資料夾",
+  "GameListContextMenuOpenDeviceSaveDirectoryToolTip": "開啟包含遊戲系統設定的資料夾",
+  "GameListContextMenuOpenBcatSaveDirectory": "開啟 BCAT 資料夾",
+  "GameListContextMenuOpenBcatSaveDirectoryToolTip": "開啟包含遊戲 BCAT 資料的資料夾",
  "GameListContextMenuManageTitleUpdates": "管理遊戲更新",
  "GameListContextMenuManageTitleUpdatesToolTip": "開啟更新管理視窗",
  "GameListContextMenuManageDlc": "管理 DLC",
@@ -610,4 +610,4 @@
  "UserProfilesRecoverLostAccounts": "恢復遺失的帳號",
  "Recover": "恢復",
  "UserProfilesRecoverHeading": "在以下帳號找到了一些遊戲存檔"
-}
+}
--- a/Ryujinx.Ava/Program.cs
+++ b/Ryujinx.Ava/Program.cs
@@ -6,8 +6,8 @@ using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.GraphicsDriver;
 using Ryujinx.Common.Logging;
-using Ryujinx.Common.SystemInterop;
 using Ryujinx.Common.SystemInfo;
+using Ryujinx.Common.SystemInterop;
 using Ryujinx.Modules;
 using Ryujinx.SDL2.Common;
 using Ryujinx.Ui.Common;
@@ -227,6 +227,12 @@ namespace Ryujinx.Ava
                    ConfigurationState.Instance.Graphics.GraphicsBackend.Value = GraphicsBackend.Vulkan;
                }
            }
+
+            // Check if docked mode was overriden.
+            if (CommandLineState.OverrideDockedMode.HasValue)
+            {
+                ConfigurationState.Instance.System.EnableDockedMode.Value = CommandLineState.OverrideDockedMode.Value;
+            }
        }

        private static void PrintSystemInfo()
--- a/Ryujinx.Ava/UI/Controls/GameGridView.axaml
+++ b/Ryujinx.Ava/UI/Controls/GameGridView.axaml
@@ -26,12 +26,12 @@
                ToolTip.Tip="{locale:Locale GameListContextMenuOpenUserSaveDirectoryToolTip}" />
            <MenuItem
                Command="{Binding OpenDeviceSaveDirectory}"
-                Header="{locale:Locale GameListContextMenuOpenUserDeviceDirectory}"
-                ToolTip.Tip="{locale:Locale GameListContextMenuOpenUserDeviceDirectoryToolTip}" />
+                Header="{locale:Locale GameListContextMenuOpenDeviceSaveDirectory}"
+                ToolTip.Tip="{locale:Locale GameListContextMenuOpenDeviceSaveDirectoryToolTip}" />
            <MenuItem
                Command="{Binding OpenBcatSaveDirectory}"
-                Header="{locale:Locale GameListContextMenuOpenUserBcatDirectory}"
-                ToolTip.Tip="{locale:Locale GameListContextMenuOpenUserBcatDirectoryToolTip}" />
+                Header="{locale:Locale GameListContextMenuOpenBcatSaveDirectory}"
+                ToolTip.Tip="{locale:Locale GameListContextMenuOpenBcatSaveDirectoryToolTip}" />
            <Separator />
            <MenuItem
                Command="{Binding OpenTitleUpdateManager}"
--- a/Ryujinx.Ava/UI/Controls/GameListView.axaml
+++ b/Ryujinx.Ava/UI/Controls/GameListView.axaml
@@ -25,12 +25,12 @@
                ToolTip.Tip="{locale:Locale GameListContextMenuOpenUserSaveDirectoryToolTip}" />
            <MenuItem
                Command="{Binding OpenDeviceSaveDirectory}"
-                Header="{locale:Locale GameListContextMenuOpenUserDeviceDirectory}"
-                ToolTip.Tip="{locale:Locale GameListContextMenuOpenUserDeviceDirectoryToolTip}" />
+                Header="{locale:Locale GameListContextMenuOpenDeviceSaveDirectory}"
+                ToolTip.Tip="{locale:Locale GameListContextMenuOpenDeviceSaveDirectoryToolTip}" />
            <MenuItem
                Command="{Binding OpenBcatSaveDirectory}"
-                Header="{locale:Locale GameListContextMenuOpenUserBcatDirectory}"
-                ToolTip.Tip="{locale:Locale GameListContextMenuOpenUserBcatDirectoryToolTip}" />
+                Header="{locale:Locale GameListContextMenuOpenBcatSaveDirectory}"
+                ToolTip.Tip="{locale:Locale GameListContextMenuOpenBcatSaveDirectoryToolTip}" />
            <Separator />
            <MenuItem
                Command="{Binding OpenTitleUpdateManager}"
--- a/Ryujinx.Ava/UI/Helpers/ContentDialogHelper.cs
+++ b/Ryujinx.Ava/UI/Helpers/ContentDialogHelper.cs
@@ -349,7 +349,7 @@ namespace Ryujinx.Ava.UI.Helpers

            Window parent = GetMainWindow();

-            if (parent.IsActive && parent is MainWindow window && window.ViewModel.IsGameRunning)
+            if (parent != null && parent.IsActive && parent is MainWindow window && window.ViewModel.IsGameRunning)
            {
                contentDialogOverlayWindow = new()
                {
--- a/Ryujinx.Ava/UI/Windows/AvatarWindow.axaml
+++ b/Ryujinx.Ava/UI/Windows/AvatarWindow.axaml
@@ -1,4 +1,4 @@
-<UserControl 
+<UserControl
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -17,9 +17,9 @@
    <Design.DataContext>
        <viewModels:AvatarProfileViewModel />
    </Design.DataContext>
-	<UserControl.Resources>
-		<helpers:BitmapArrayValueConverter x:Key="ByteImage" />
-	</UserControl.Resources>
+    <UserControl.Resources>
+        <helpers:BitmapArrayValueConverter x:Key="ByteImage" />
+    </UserControl.Resources>
    <Grid Margin="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
        <Grid.RowDefinitions>
            <RowDefinition Height="Auto" />
--- a/Ryujinx.HLE/HOS/Services/Settings/NxSettings.cs
+++ b/Ryujinx.HLE/HOS/Services/Settings/NxSettings.cs
--- a/Ryujinx.Headless.SDL2/Ryujinx.Headless.SDL2.csproj
+++ b/Ryujinx.Headless.SDL2/Ryujinx.Headless.SDL2.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
    <TargetFramework>net7.0</TargetFramework>
@@ -31,16 +31,22 @@
    <PackageReference Include="CommandLineParser" />
  </ItemGroup>

-	<ItemGroup>
-      <Content Include="..\distribution\legal\THIRDPARTY.md">
-        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-        <TargetPath>THIRDPARTY.md</TargetPath>
-      </Content>
-      <Content Include="..\LICENSE.txt">
-        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-        <TargetPath>LICENSE.txt</TargetPath>
-      </Content>
-	</ItemGroup>
+  <ItemGroup>
+    <Content Include="..\distribution\legal\THIRDPARTY.md">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <TargetPath>THIRDPARTY.md</TargetPath>
+    </Content>
+    <Content Include="..\LICENSE.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <TargetPath>LICENSE.txt</TargetPath>
+    </Content>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(RuntimeIdentifier)' == 'linux-x64'">
+    <Content Include="..\distribution\linux\Ryujinx.sh">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>

  <ItemGroup>
    <EmbeddedResource Include="Ryujinx.bmp" />
--- a/Ryujinx.Ui.Common/Helper/CommandLineState.cs
+++ b/Ryujinx.Ui.Common/Helper/CommandLineState.cs
@@ -7,6 +7,7 @@ namespace Ryujinx.Ui.Common.Helper
    {
        public static string[] Arguments { get; private set; }

+        public static bool?  OverrideDockedMode      { get; private set; }
        public static string OverrideGraphicsBackend { get; private set; }
        public static string BaseDirPathArg          { get; private set; }
        public static string Profile                 { get; private set; }
@@ -69,6 +70,12 @@ namespace Ryujinx.Ui.Common.Helper

                        OverrideGraphicsBackend = args[++i];
                        break;
+                    case "--docked-mode":
+                        OverrideDockedMode = true;
+                        break;
+                    case "--handheld-mode":
+                        OverrideDockedMode = false;
+                        break;
                    default:
                        LaunchPathArg = arg;
                        break;
--- a/Ryujinx/Program.cs
+++ b/Ryujinx/Program.cs
@@ -3,8 +3,8 @@ using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.GraphicsDriver;
 using Ryujinx.Common.Logging;
-using Ryujinx.Common.SystemInterop;
 using Ryujinx.Common.SystemInfo;
+using Ryujinx.Common.SystemInterop;
 using Ryujinx.Modules;
 using Ryujinx.SDL2.Common;
 using Ryujinx.Ui;
@@ -271,6 +271,12 @@ namespace Ryujinx
                }
            }

+            // Check if docked mode was overriden.
+            if (CommandLineState.OverrideDockedMode.HasValue)
+            {
+                ConfigurationState.Instance.System.EnableDockedMode.Value = CommandLineState.OverrideDockedMode.Value;
+            }
+
            // Logging system information.
            PrintSystemInfo();

--- a/distribution/linux/Ryujinx.sh
+++ b/distribution/linux/Ryujinx.sh
@@ -1,5 +1,14 @@
 #!/bin/sh

 SCRIPT_DIR=$(dirname $(realpath $0))
+RYUJINX_BIN="Ryujinx"

-env DOTNET_EnableAlternateStackCheck=1 "$SCRIPT_DIR/Ryujinx" "$@"
+if [ -f "$SCRIPT_DIR/Ryujinx.Ava" ]; then
+    RYUJINX_BIN="Ryujinx.Ava"
+fi
+
+if [ -f "$SCRIPT_DIR/Ryujinx.Headless.SDL2" ]; then
+    RYUJINX_BIN="Ryujinx.Headless.SDL2"
+fi
+
+env DOTNET_EnableAlternateStackCheck=1 "$SCRIPT_DIR/$RYUJINX_BIN" "$@"
--- a/distribution/macos/Info.plist
+++ b/distribution/macos/Info.plist
@@ -40,6 +40,8 @@
    <true/>
    <key>NSHumanReadableCopyright</key>
    <string>Copyright © 2018 - 2022 Ryujinx Team and Contributors.</string>
+    <key>LSApplicationCategoryType</key>
+    <string>public.app-category.games</string>
    <key>LSMinimumSystemVersion</key>
    <string>11.0</string>
 </dict>
Author	SHA1	Message	Date
UltraHDR	d16288a2a8	Set LSApplicationCategoryType to games (#4257 ) https://developer.apple.com/documentation/bundleresources/information_property_list/lsapplicationcategorytype Makes it auto-add to the macOS Launchpad games folder	2023-01-10 21:49:46 +00:00
Isaac Marovitz	600f86dc7b	Fix context menu locales (#4242 )	2023-01-10 19:15:15 +01:00
Mary-nyan	7210c17c5e	misc: Enforce LF (#4253 ) Because we are building everything on Windows for release at the moment, git default line ending to CRLF causing issues when packing the Ryujinx.sh script. This addresses this by enforcing all files to use LF via .gitattributes.	2023-01-10 19:00:14 +01:00
Ac_K	a16854e55a	ava: Cleanup AppHost (#4240 ) * ava: Cleanup AppHost This PR cleaned up the AppHost file a bit (adding the infamous extra spaces to improve readability), resorting private vars, remove useless vars, and improve the code here and there, like the AudioBackend check. Co-Authored-By: gdkchan <5624669+gdkchan@users.noreply.github.com> * Remove 'renderer" * Revert currentTime * revert if condition Co-authored-by: gdkchan <5624669+gdkchan@users.noreply.github.com>	2023-01-10 18:45:55 +01:00
TSRBerry	3e455a90a1	Ava: Add missing null check to ContentDialogHelper.ShowAsync() (#4248 ) * ava: Add missing null check to ContentDialogHelper.ShowAsync() * Replace "is not" with != operator Co-authored-by: gdkchan <gab.dark.100@gmail.com> Co-authored-by: gdkchan <gab.dark.100@gmail.com>	2023-01-10 09:22:25 +01:00
TSRBerry	e4413542b2	Add command line arguments to override docked mode (#4239 ) * Add command line args for docked mode * Apply suggestions from code review Co-authored-by: Ac_K <Acoustik666@gmail.com> Co-authored-by: Ac_K <Acoustik666@gmail.com>	2023-01-10 00:59:23 +01:00
TSRBerry	8c720783f5	linux: Fix packaging step for CI & Add Ryujinx.Headless.SDL2 to Ryujinx.sh (#4249 )	2023-01-09 23:45:46 +00:00
TSRBerry	8734ea9dd4	Linux: Add Avalonia detection to Ryujinx.sh (#4224 ) * Revert "ava: Fix regression caused by #4013 (#4222)" This reverts commit `b9f2a96595`. * linux: Detect Ryujinx.Ava and don't rename the Ryujinx.Ava assembly	2023-01-09 22:58:51 +01:00
gdkchan	c586e6d2b7	Replace tabs with spaces across the project (#4244 ) * Replace tabs with spaces across the project * Include AXAML files too	2023-01-09 22:58:29 +01:00