ava: Rework DLC Manager, Add various fixes and cleanup (#3896 )

* Fixes Everything Part.2 * Change sorting, fix remove and heading
nuget: bump SharpZipLib from 1.3.3 to 1.4.1 (#3893 )
2022-11-25 12:41:34 +01:00 · 2022-11-24 20:30:17 +01:00 · 2022-11-24 20:13:16 +01:00 · 2022-11-24 15:50:15 +01:00 · 2022-11-24 15:26:29 +01:00 · 2022-11-24 15:08:27 +01:00
50 changed files with 718 additions and 555 deletions
--- a/Ryujinx.Ava/App.axaml.cs
+++ b/Ryujinx.Ava/App.axaml.cs
@@ -21,6 +21,8 @@ namespace Ryujinx.Ava
    {
        public override void Initialize()
        {
+            Name = $"Ryujinx {Program.Version}";
+
            AvaloniaXamlLoader.Load(this);
        }

--- a/Ryujinx.Ava/AppHost.cs
+++ b/Ryujinx.Ava/AppHost.cs
@@ -60,7 +60,7 @@ namespace Ryujinx.Ava

        private const float VolumeDelta = 0.05f;

-        private static readonly Cursor InvisibleCursor = new Cursor(StandardCursorType.None);        
+        private static readonly Cursor InvisibleCursor = new Cursor(StandardCursorType.None);

        private readonly long _ticksPerFrame;
        private readonly Stopwatch _chrono;
@@ -349,7 +349,10 @@ namespace Ryujinx.Ava

            _isActive = false;

-            _renderingThread.Join();
+            if (_renderingThread.IsAlive)
+            {
+                _renderingThread.Join();
+            }

            DisplaySleep.Restore();

@@ -378,7 +381,7 @@ namespace Ryujinx.Ava

            _gpuCancellationTokenSource.Cancel();
            _gpuCancellationTokenSource.Dispose();
-            
+
            _chrono.Stop();
        }

@@ -393,7 +396,7 @@ namespace Ryujinx.Ava
            Renderer?.MakeCurrent();

            Device.DisposeGpu();
-            
+
            Renderer?.MakeCurrent(null);
        }

@@ -417,7 +420,6 @@ namespace Ryujinx.Ava
        public async Task<bool> LoadGuestApplication()
        {
            InitializeSwitchInstance();
-
            MainWindow.UpdateGraphicsConfig();

            SystemVersion firmwareVersion = ContentManager.GetCurrentFirmwareVersion();
@@ -428,17 +430,16 @@ namespace Ryujinx.Ava
                {
                    if (userError == UserError.NoFirmware)
                    {
-                        string message = string.Format(LocaleManager.Instance["DialogFirmwareInstallEmbeddedMessage"],
-                            firmwareVersion.VersionString);
-
                        UserResult result = await ContentDialogHelper.CreateConfirmationDialog(
-                            LocaleManager.Instance["DialogFirmwareNoFirmwareInstalledMessage"], message,
-                            LocaleManager.Instance["InputDialogYes"], LocaleManager.Instance["InputDialogNo"], "");
+                            LocaleManager.Instance["DialogFirmwareNoFirmwareInstalledMessage"],
+                            string.Format(LocaleManager.Instance["DialogFirmwareInstallEmbeddedMessage"], firmwareVersion.VersionString),
+                            LocaleManager.Instance["InputDialogYes"],
+                            LocaleManager.Instance["InputDialogNo"],
+                            "");

                        if (result != UserResult.Yes)
                        {
-                            Dispatcher.UIThread.Post(async () => await
-                                UserErrorDialog.ShowUserErrorDialog(userError, _parent));
+                            await UserErrorDialog.ShowUserErrorDialog(userError, _parent);
                            Device.Dispose();

                            return false;
@@ -447,8 +448,7 @@ namespace Ryujinx.Ava

                    if (!SetupValidator.TryFixStartApplication(ContentManager, ApplicationPath, userError, out _))
                    {
-                        Dispatcher.UIThread.Post(async () => await
-                            UserErrorDialog.ShowUserErrorDialog(userError, _parent));
+                        await UserErrorDialog.ShowUserErrorDialog(userError, _parent);
                        Device.Dispose();

                        return false;
@@ -461,11 +461,9 @@ namespace Ryujinx.Ava

                        _parent.RefreshFirmwareStatus();

-                        string message = string.Format(LocaleManager.Instance["DialogFirmwareInstallEmbeddedSuccessMessage"], firmwareVersion.VersionString);
-
                        await ContentDialogHelper.CreateInfoDialog(
                            string.Format(LocaleManager.Instance["DialogFirmwareInstalledMessage"], firmwareVersion.VersionString),
-                            message,
+                            string.Format(LocaleManager.Instance["DialogFirmwareInstallEmbeddedSuccessMessage"], firmwareVersion.VersionString),
                            LocaleManager.Instance["InputDialogOk"],
                            "",
                            LocaleManager.Instance["RyujinxInfo"]);
@@ -473,9 +471,7 @@ namespace Ryujinx.Ava
                }
                else
                {
-                    Dispatcher.UIThread.Post(async () => await
-                        UserErrorDialog.ShowUserErrorDialog(userError, _parent));
-
+                    await UserErrorDialog.ShowUserErrorDialog(userError, _parent);
                    Device.Dispose();

                    return false;
@@ -514,7 +510,7 @@ namespace Ryujinx.Ava
            }
            else if (File.Exists(ApplicationPath))
            {
-                switch (System.IO.Path.GetExtension(ApplicationPath).ToLowerInvariant())
+                switch (Path.GetExtension(ApplicationPath).ToLowerInvariant())
                {
                    case ".xci":
                        {
@@ -602,7 +598,7 @@ namespace Ryujinx.Ava
            if (Renderer.IsVulkan)
            {
                string preferredGpu = ConfigurationState.Instance.Graphics.PreferredGpu.Value;
-                
+
                renderer = new VulkanRenderer(Renderer.CreateVulkanSurface, VulkanHelper.GetRequiredInstanceExtensions, preferredGpu);
            }
            else
--- a/Ryujinx.Ava/Assets/Locales/en_US.json
+++ b/Ryujinx.Ava/Assets/Locales/en_US.json
@@ -410,6 +410,8 @@
  "DlcManagerTableHeadingContainerPathLabel": "Container Path",
  "DlcManagerTableHeadingFullPathLabel": "Full Path",
  "DlcManagerRemoveAllButton": "Remove All",
+  "DlcManagerEnableAllButton": "Enable All",
+  "DlcManagerDisableAllButton": "Disable All",
  "MenuBarOptionsChangeLanguage": "Change Language",
  "CommonSort": "Sort",
  "CommonShowNames": "Show Names",
@@ -567,7 +569,7 @@
  "DlcWindowTitle": "Manage Game DLC",
  "UpdateWindowTitle": "Manage Game Updates",
  "CheatWindowHeading": "Cheats Available for {0} [{1}]",
-  "DlcWindowHeading": "DLC Available for {0} [{1}]",
+  "DlcWindowHeading": "{0} Downloadable Content(s) available for {1} ({2})",
  "UserProfilesEditProfile": "Edit Selected",
  "Cancel": "Cancel",
  "Save": "Save",
--- a/Ryujinx.Ava/Program.cs
+++ b/Ryujinx.Ava/Program.cs
@@ -23,19 +23,18 @@ namespace Ryujinx.Ava
 {
    internal class Program
    {
-        public static double WindowScaleFactor { get; set; }
-        public static double ActualScaleFactor { get; set; }
-        public static string Version { get; private set; }
-        public static string ConfigurationPath { get; private set; }
-        public static bool PreviewerDetached { get; private set; }
-
-        public static RenderTimer RenderTimer { get; private set; }
+        public static double      WindowScaleFactor { get; set; }
+        public static double      ActualScaleFactor { get; set; }
+        public static string      Version           { get; private set; }
+        public static string      ConfigurationPath { get; private set; }
+        public static bool        PreviewerDetached { get; private set; }
+        public static RenderTimer RenderTimer       { get; private set; }

        [DllImport("user32.dll", SetLastError = true)]
        public static extern int MessageBoxA(IntPtr hWnd, string text, string caption, uint type);

        private const uint MB_ICONWARNING = 0x30;
-        private const int BaseDpi = 96;
+        private const int  BaseDpi        = 96;

        public static void Main(string[] args)
        {
@@ -43,7 +42,7 @@ namespace Ryujinx.Ava

            if (OperatingSystem.IsWindows() && !OperatingSystem.IsWindowsVersionAtLeast(10, 0, 17134))
            {
-                MessageBoxA(IntPtr.Zero, "You are running an outdated version of Windows.\n\nStarting on June 1st 2022, Ryujinx will only support Windows 10 1803 and newer.\n", $"Ryujinx {Version}", MB_ICONWARNING);
+                _ = MessageBoxA(IntPtr.Zero, "You are running an outdated version of Windows.\n\nStarting on June 1st 2022, Ryujinx will only support Windows 10 1803 and newer.\n", $"Ryujinx {Version}", MB_ICONWARNING);
            }

            PreviewerDetached = true;
@@ -64,16 +63,16 @@ namespace Ryujinx.Ava
                .With(new X11PlatformOptions
                {
                    EnableMultiTouch = true,
-                    EnableIme = true,
-                    UseEGL = false,
-                    UseGpu = false
+                    EnableIme        = true,
+                    UseEGL           = false,
+                    UseGpu           = false
                })
                .With(new Win32PlatformOptions
                {
-                    EnableMultitouch = true,
-                    UseWgl = false,
-                    AllowEglInitialization = false,
-                    CompositionBackdropCornerRadius = 8f,
+                    EnableMultitouch                = true,
+                    UseWgl                          = false,
+                    AllowEglInitialization          = false,
+                    CompositionBackdropCornerRadius = 8.0f,
                })
                .UseSkia()
                .AfterSetup(_ =>
@@ -122,12 +121,10 @@ namespace Ryujinx.Ava
            PrintSystemInfo();

            // Enable OGL multithreading on the driver, when available.
-            BackendThreading threadingMode = ConfigurationState.Instance.Graphics.BackendThreading;
-            DriverUtilities.ToggleOGLThreading(threadingMode == BackendThreading.Off);
+            DriverUtilities.ToggleOGLThreading(ConfigurationState.Instance.Graphics.BackendThreading == BackendThreading.Off);

            // Check if keys exists.
-            bool hasSystemProdKeys = File.Exists(Path.Combine(AppDataManager.KeysDirPath, "prod.keys"));
-            if (!hasSystemProdKeys)
+            if (!File.Exists(Path.Combine(AppDataManager.KeysDirPath, "prod.keys")))
            {
                if (!(AppDataManager.Mode == AppDataManager.LaunchMode.UserProfile && File.Exists(Path.Combine(AppDataManager.KeysDirPathUser, "prod.keys"))))
                {
@@ -143,7 +140,7 @@ namespace Ryujinx.Ava

        public static void ReloadConfig()
        {
-            string localConfigurationPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Config.json");
+            string localConfigurationPath   = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Config.json");
            string appDataConfigurationPath = Path.Combine(AppDataManager.BaseDirPath, "Config.json");

            // Now load the configuration as the other subsystems are now registered
@@ -197,8 +194,7 @@ namespace Ryujinx.Ava
            Logger.Notice.Print(LogClass.Application, $"Ryujinx Version: {Version}");
            SystemInfo.Gather().Print();

-            var enabledLogs = Logger.GetEnabledLevels();
-            Logger.Notice.Print(LogClass.Application, $"Logs Enabled: {(enabledLogs.Count == 0 ? "<None>" : string.Join(", ", enabledLogs))}");
+            Logger.Notice.Print(LogClass.Application, $"Logs Enabled: {(Logger.GetEnabledLevels().Count == 0 ? "<None>" : string.Join(", ", Logger.GetEnabledLevels()))}");

            if (AppDataManager.Mode == AppDataManager.LaunchMode.Custom)
            {
--- a/Ryujinx.Ava/Ryujinx.Ava.csproj
+++ b/Ryujinx.Ava/Ryujinx.Ava.csproj
@@ -37,7 +37,7 @@
    <PackageReference Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.10.1" />
    <PackageReference Include="Silk.NET.Vulkan.Extensions.KHR" Version="2.10.1" />
    <PackageReference Include="SPB" Version="0.0.4-build28" />
-    <PackageReference Include="SharpZipLib" Version="1.3.3" />
+    <PackageReference Include="SharpZipLib" Version="1.4.1" />
    <PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" />
  </ItemGroup>

--- a/Ryujinx.Ava/Ui/Applet/AvaHostUiHandler.cs
+++ b/Ryujinx.Ava/Ui/Applet/AvaHostUiHandler.cs
@@ -57,14 +57,14 @@ namespace Ryujinx.Ava.Ui.Applet

                    bool opened = false;

-                    UserResult response = await ContentDialogHelper.ShowDeferredContentDialog(_parent, 
-                       title, 
-                       message, 
-                       "", 
-                       LocaleManager.Instance["DialogOpenSettingsWindowLabel"], 
-                       "", 
-                       LocaleManager.Instance["SettingsButtonClose"], 
-                       (int)Symbol.Important, 
+                    UserResult response = await ContentDialogHelper.ShowDeferredContentDialog(_parent,
+                       title,
+                       message,
+                       "",
+                       LocaleManager.Instance["DialogOpenSettingsWindowLabel"],
+                       "",
+                       LocaleManager.Instance["SettingsButtonClose"],
+                       (int)Symbol.Important,
                       deferEvent,
                       async (window) =>
                       {
@@ -168,7 +168,7 @@ namespace Ryujinx.Ava.Ui.Applet

                    object response = await msgDialog.Run();

-                    if (response != null && buttons.Length > 1 && (int)response != buttons.Length - 1)
+                    if (response != null && buttons != null && buttons.Length > 1 && (int)response != buttons.Length - 1)
                    {
                        showDetails = true;
                    }
--- a/Ryujinx.Ava/Ui/Controls/OpenGLEmbeddedWindow.cs
+++ b/Ryujinx.Ava/Ui/Controls/OpenGLEmbeddedWindow.cs
@@ -49,7 +49,7 @@ namespace Ryujinx.Ava.Ui.Controls
            {
                throw new PlatformNotSupportedException();
            }
-            
+
            var flags = OpenGLContextFlags.Compat;
            if (_graphicsDebugLevel != GraphicsDebugLevel.None)
            {
@@ -69,12 +69,12 @@ namespace Ryujinx.Ava.Ui.Controls

        public void MakeCurrent()
        {
-            Context.MakeCurrent(_window);
+            Context?.MakeCurrent(_window);
        }

        public void MakeCurrent(NativeWindowBase window)
        {
-            Context.MakeCurrent(window);
+            Context?.MakeCurrent(window);
        }

        public void SwapBuffers()
--- a/Ryujinx.Ava/Ui/Models/DownloadableContentModel.cs
+++ b/Ryujinx.Ava/Ui/Models/DownloadableContentModel.cs
@@ -1,8 +1,22 @@
-namespace Ryujinx.Ava.Ui.Models
+using Ryujinx.Ava.Ui.ViewModels;
+
+namespace Ryujinx.Ava.Ui.Models
 {
-    public class DownloadableContentModel
+    public class DownloadableContentModel : BaseModel
    {
-        public bool   Enabled       { get; set; }
+        private bool _enabled;
+
+        public bool Enabled
+        {
+            get => _enabled;
+            set
+            {
+                _enabled = value;
+
+                OnPropertyChanged();
+            }
+        }
+
        public string TitleId       { get; }
        public string ContainerPath { get; }
        public string FullPath      { get; }
--- a/Ryujinx.Ava/Ui/ViewModels/MainWindowViewModel.cs
+++ b/Ryujinx.Ava/Ui/ViewModels/MainWindowViewModel.cs
@@ -19,6 +19,7 @@ using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
 using Ryujinx.HLE;
 using Ryujinx.HLE.FileSystem;
+using Ryujinx.HLE.HOS;
 using Ryujinx.Modules;
 using Ryujinx.Ui.App.Common;
 using Ryujinx.Ui.Common;
@@ -47,6 +48,7 @@ namespace Ryujinx.Ava.Ui.ViewModels
        private string _loadHeading;
        private string _cacheLoadStatus;
        private string _searchText;
+        private Timer _searchTimer;
        private string _dockedStatusText;
        private string _fifoStatusText;
        private string _gameStatusText;
@@ -115,10 +117,20 @@ namespace Ryujinx.Ava.Ui.ViewModels
            {
                _searchText = value;

-                RefreshView();
+                _searchTimer?.Dispose();
+
+                _searchTimer = new Timer(TimerCallback, null, 1000, 0);
            }
        }

+        private void TimerCallback(object obj)
+        {
+            RefreshView();
+
+            _searchTimer.Dispose();
+            _searchTimer = null;
+        }
+
        public ReadOnlyObservableCollection<ApplicationData> AppsObservableList
        {
            get => _appsObservableList;
@@ -200,22 +212,19 @@ namespace Ryujinx.Ava.Ui.ViewModels
        private string _showUikey = "F4";
        private string _pauseKey = "F5";
        private string _screenshotkey = "F8";
-        private float _volume;
+        private float  _volume;
        private string _backendText;

        public ApplicationData SelectedApplication
        {
            get
            {
-                switch (Glyph)
+                return Glyph switch
                {
-                    case Glyph.List:
-                        return _owner.GameList.SelectedApplication;
-                    case Glyph.Grid:
-                        return _owner.GameGrid.SelectedApplication;
-                    default:
-                        return null;
-                }
+                    Glyph.List => _owner.GameList.SelectedApplication,
+                    Glyph.Grid => _owner.GameGrid.SelectedApplication,
+                    _          => null,
+                };
            }
        }

@@ -408,6 +417,7 @@ namespace Ryujinx.Ava.Ui.ViewModels
                {
                    _owner.AppHost.Device.SetVolume(_volume);
                }
+
                OnPropertyChanged(nameof(VolumeStatusText));
                OnPropertyChanged(nameof(VolumeMuted));
                OnPropertyChanged();
@@ -477,38 +487,36 @@ namespace Ryujinx.Ava.Ui.ViewModels
        internal void Sort(bool isAscending)
        {
            IsAscending = isAscending;
+
            RefreshView();
        }

        internal void Sort(ApplicationSort sort)
        {
            SortMode = sort;
+
            RefreshView();
        }

        private IComparer<ApplicationData> GetComparer()
        {
-            switch (SortMode)
+            return SortMode switch
            {
-                case ApplicationSort.LastPlayed:
-                    return new Models.Generic.LastPlayedSortComparer(IsAscending);
-                case ApplicationSort.FileSize:
-                    return new Models.Generic.FileSizeSortComparer(IsAscending);
-                case ApplicationSort.TotalTimePlayed:
-                    return new Models.Generic.TimePlayedSortComparer(IsAscending);
-                case ApplicationSort.Title:
-                    return IsAscending ? SortExpressionComparer<ApplicationData>.Ascending(app => app.TitleName) : SortExpressionComparer<ApplicationData>.Descending(app => app.TitleName);
-                case ApplicationSort.Favorite:
-                    return !IsAscending ? SortExpressionComparer<ApplicationData>.Ascending(app => app.Favorite) : SortExpressionComparer<ApplicationData>.Descending(app => app.Favorite);
-                case ApplicationSort.Developer:
-                    return IsAscending ? SortExpressionComparer<ApplicationData>.Ascending(app => app.Developer) : SortExpressionComparer<ApplicationData>.Descending(app => app.Developer);
-                case ApplicationSort.FileType:
-                    return IsAscending ? SortExpressionComparer<ApplicationData>.Ascending(app => app.FileExtension) : SortExpressionComparer<ApplicationData>.Descending(app => app.FileExtension);
-                case ApplicationSort.Path:
-                    return IsAscending ? SortExpressionComparer<ApplicationData>.Ascending(app => app.Path) : SortExpressionComparer<ApplicationData>.Descending(app => app.Path);
-                default:
-                    return null;
-            }
+                ApplicationSort.LastPlayed      => new Models.Generic.LastPlayedSortComparer(IsAscending),
+                ApplicationSort.FileSize        => new Models.Generic.FileSizeSortComparer(IsAscending),
+                ApplicationSort.TotalTimePlayed => new Models.Generic.TimePlayedSortComparer(IsAscending),
+                ApplicationSort.Title           => IsAscending  ? SortExpressionComparer<ApplicationData>.Ascending(app  => app.TitleName)
+                                                                : SortExpressionComparer<ApplicationData>.Descending(app => app.TitleName),
+                ApplicationSort.Favorite        => !IsAscending ? SortExpressionComparer<ApplicationData>.Ascending(app  => app.Favorite)
+                                                                : SortExpressionComparer<ApplicationData>.Descending(app => app.Favorite),
+                ApplicationSort.Developer       => IsAscending  ? SortExpressionComparer<ApplicationData>.Ascending(app  => app.Developer)
+                                                                : SortExpressionComparer<ApplicationData>.Descending(app => app.Developer),
+                ApplicationSort.FileType        => IsAscending  ? SortExpressionComparer<ApplicationData>.Ascending(app  => app.FileExtension)
+                                                                : SortExpressionComparer<ApplicationData>.Descending(app => app.FileExtension),
+                ApplicationSort.Path            => IsAscending  ? SortExpressionComparer<ApplicationData>.Ascending(app  => app.Path)
+                                                                : SortExpressionComparer<ApplicationData>.Descending(app => app.Path),
+                _                               => null,
+            };
        }

        private void RefreshView()
@@ -611,40 +619,31 @@ namespace Ryujinx.Ava.Ui.ViewModels
            }
        }

-        public bool IsSortedByFavorite => SortMode == ApplicationSort.Favorite;
-        public bool IsSortedByTitle => SortMode == ApplicationSort.Title;
-        public bool IsSortedByDeveloper => SortMode == ApplicationSort.Developer;
+        public bool IsSortedByFavorite   => SortMode == ApplicationSort.Favorite;
+        public bool IsSortedByTitle      => SortMode == ApplicationSort.Title;
+        public bool IsSortedByDeveloper  => SortMode == ApplicationSort.Developer;
        public bool IsSortedByLastPlayed => SortMode == ApplicationSort.LastPlayed;
        public bool IsSortedByTimePlayed => SortMode == ApplicationSort.TotalTimePlayed;
-        public bool IsSortedByType => SortMode == ApplicationSort.FileType;
-        public bool IsSortedBySize => SortMode == ApplicationSort.FileSize;
-        public bool IsSortedByPath => SortMode == ApplicationSort.Path;
+        public bool IsSortedByType       => SortMode == ApplicationSort.FileType;
+        public bool IsSortedBySize       => SortMode == ApplicationSort.FileSize;
+        public bool IsSortedByPath       => SortMode == ApplicationSort.Path;

        public string SortName
        {
            get
            {
-                switch (SortMode)
+                return SortMode switch
                {
-                    case ApplicationSort.Title:
-                        return LocaleManager.Instance["GameListHeaderApplication"];
-                    case ApplicationSort.Developer:
-                        return LocaleManager.Instance["GameListHeaderDeveloper"];
-                    case ApplicationSort.LastPlayed:
-                        return LocaleManager.Instance["GameListHeaderLastPlayed"];
-                    case ApplicationSort.TotalTimePlayed:
-                        return LocaleManager.Instance["GameListHeaderTimePlayed"];
-                    case ApplicationSort.FileType:
-                        return LocaleManager.Instance["GameListHeaderFileExtension"];
-                    case ApplicationSort.FileSize:
-                        return LocaleManager.Instance["GameListHeaderFileSize"];
-                    case ApplicationSort.Path:
-                        return LocaleManager.Instance["GameListHeaderPath"];
-                    case ApplicationSort.Favorite:
-                        return LocaleManager.Instance["CommonFavorite"];
-                }
-
-                return string.Empty;
+                    ApplicationSort.Title           => LocaleManager.Instance["GameListHeaderApplication"],
+                    ApplicationSort.Developer       => LocaleManager.Instance["GameListHeaderDeveloper"],
+                    ApplicationSort.LastPlayed      => LocaleManager.Instance["GameListHeaderLastPlayed"],
+                    ApplicationSort.TotalTimePlayed => LocaleManager.Instance["GameListHeaderTimePlayed"],
+                    ApplicationSort.FileType        => LocaleManager.Instance["GameListHeaderFileExtension"],
+                    ApplicationSort.FileSize        => LocaleManager.Instance["GameListHeaderFileSize"],
+                    ApplicationSort.Path            => LocaleManager.Instance["GameListHeaderPath"],
+                    ApplicationSort.Favorite        => LocaleManager.Instance["CommonFavorite"],
+                    _                               => string.Empty,
+                };
            }
        }

@@ -668,6 +667,7 @@ namespace Ryujinx.Ava.Ui.ViewModels
            get => KeyGesture.Parse(_showUikey); set
            {
                _showUikey = value.ToString();
+
                OnPropertyChanged();
            }
        }
@@ -677,6 +677,7 @@ namespace Ryujinx.Ava.Ui.ViewModels
            get => KeyGesture.Parse(_screenshotkey); set
            {
                _screenshotkey = value.ToString();
+
                OnPropertyChanged();
            }
        }
@@ -686,14 +687,15 @@ namespace Ryujinx.Ava.Ui.ViewModels
            get => KeyGesture.Parse(_pauseKey); set
            {
                _pauseKey = value.ToString();
+
                OnPropertyChanged();
            }
        }

-        public bool IsGridSmall => ConfigurationState.Instance.Ui.GridSize == 1;
+        public bool IsGridSmall  => ConfigurationState.Instance.Ui.GridSize == 1;
        public bool IsGridMedium => ConfigurationState.Instance.Ui.GridSize == 2;
-        public bool IsGridLarge => ConfigurationState.Instance.Ui.GridSize == 3;
-        public bool IsGridHuge => ConfigurationState.Instance.Ui.GridSize == 4;
+        public bool IsGridLarge  => ConfigurationState.Instance.Ui.GridSize == 3;
+        public bool IsGridHuge   => ConfigurationState.Instance.Ui.GridSize == 4;

        public int GridSizeScale
        {
@@ -728,14 +730,14 @@ namespace Ryujinx.Ava.Ui.ViewModels

            if (_owner.AppHost.Device.System.SearchingForAmiibo(out int deviceId))
            {
-                string titleId = _owner.AppHost.Device.Application.TitleIdText.ToUpper();
+                string      titleId = _owner.AppHost.Device.Application.TitleIdText.ToUpper();
                AmiiboWindow window = new(_showAll, _lastScannedAmiiboId, titleId);

                await window.ShowDialog(_owner);

                if (window.IsScanned)
                {
-                    _showAll = window.ViewModel.ShowAllAmiibo;
+                    _showAll             = window.ViewModel.ShowAllAmiibo;
                    _lastScannedAmiiboId = window.ScannedAmiibo.GetId();

                    _owner.AppHost.Device.System.ScanAmiibo(deviceId, _lastScannedAmiiboId, window.ViewModel.UseRandomUuid);
@@ -766,8 +768,9 @@ namespace Ryujinx.Ava.Ui.ViewModels

        private void ApplicationLibrary_ApplicationCountUpdated(object sender, ApplicationCountUpdatedEventArgs e)
        {
-            StatusBarProgressValue = e.NumAppsLoaded;
+            StatusBarProgressValue   = e.NumAppsLoaded;
            StatusBarProgressMaximum = e.NumAppsFound;
+
            LocaleManager.Instance.UpdateDynamicValue("StatusBarGamesLoaded", StatusBarProgressValue, StatusBarProgressMaximum);

            Dispatcher.UIThread.Post(() =>
@@ -792,9 +795,11 @@ namespace Ryujinx.Ava.Ui.ViewModels
            await Dispatcher.UIThread.InvokeAsync(() =>
            {
                Applications.Clear();
+
                _owner.LoadProgressBar.IsVisible = true;
-                StatusBarProgressMaximum = 0;
-                StatusBarProgressValue = 0;
+                StatusBarProgressMaximum         = 0;
+                StatusBarProgressValue           = 0;
+
                LocaleManager.Instance.UpdateDynamicValue("StatusBarGamesLoaded", 0, 0);
            });

@@ -842,12 +847,12 @@ namespace Ryujinx.Ava.Ui.ViewModels
                }
            });

-            dialog.Filters.Add(new FileDialogFilter { Name = "NSP", Extensions = { "nsp" } });
+            dialog.Filters.Add(new FileDialogFilter { Name = "NSP",  Extensions = { "nsp" } });
            dialog.Filters.Add(new FileDialogFilter { Name = "PFS0", Extensions = { "pfs0" } });
-            dialog.Filters.Add(new FileDialogFilter { Name = "XCI", Extensions = { "xci" } });
-            dialog.Filters.Add(new FileDialogFilter { Name = "NCA", Extensions = { "nca" } });
-            dialog.Filters.Add(new FileDialogFilter { Name = "NRO", Extensions = { "nro" } });
-            dialog.Filters.Add(new FileDialogFilter { Name = "NSO", Extensions = { "nso" } });
+            dialog.Filters.Add(new FileDialogFilter { Name = "XCI",  Extensions = { "xci" } });
+            dialog.Filters.Add(new FileDialogFilter { Name = "NCA",  Extensions = { "nca" } });
+            dialog.Filters.Add(new FileDialogFilter { Name = "NRO",  Extensions = { "nro" } });
+            dialog.Filters.Add(new FileDialogFilter { Name = "NSO",  Extensions = { "nso" } });

            string[] files = await dialog.ShowAsync(_owner);

@@ -878,10 +883,12 @@ namespace Ryujinx.Ava.Ui.ViewModels
            {
                ShowUiKey = new KeyGesture(showUiKey, KeyModifiers.None);
            }
+
            if (AvaloniaMappingHelper.TryGetAvaKey((Ryujinx.Input.Key)ConfigurationState.Instance.Hid.Hotkeys.Value.Screenshot, out var screenshotKey))
            {
                ScreenshotKey = new KeyGesture(screenshotKey, KeyModifiers.None);
            }
+
            if (AvaloniaMappingHelper.TryGetAvaKey((Ryujinx.Input.Key)ConfigurationState.Instance.Hid.Hotkeys.Value.Pause, out var pauseKey))
            {
                PauseKey = new KeyGesture(pauseKey, KeyModifiers.None);
@@ -941,9 +948,7 @@ namespace Ryujinx.Ava.Ui.ViewModels

            _lastFullscreenToggle = Environment.TickCount64;

-            WindowState state = _owner.WindowState;
-
-            if (state == WindowState.FullScreen)
+            if (_owner.WindowState == WindowState.FullScreen)
            {
                _owner.WindowState = WindowState.Normal;

@@ -971,8 +976,7 @@ namespace Ryujinx.Ava.Ui.ViewModels
        {
            if (IsGameRunning)
            {
-                ConfigurationState.Instance.System.EnableDockedMode.Value =
-                    !ConfigurationState.Instance.System.EnableDockedMode.Value;
+                ConfigurationState.Instance.System.EnableDockedMode.Value = !ConfigurationState.Instance.System.EnableDockedMode.Value;
            }
        }

@@ -985,6 +989,7 @@ namespace Ryujinx.Ava.Ui.ViewModels
            else if (IsGameRunning)
            {
                await Task.Delay(100);
+
                _owner.AppHost?.ShowExitPrompt();
            }
        }
@@ -994,6 +999,7 @@ namespace Ryujinx.Ava.Ui.ViewModels
            _owner.SettingsWindow = new(_owner.VirtualFileSystem, _owner.ContentManager);

            await _owner.SettingsWindow.ShowDialog(_owner);
+
            LoadConfigurableHotKeys();
        }

@@ -1004,9 +1010,7 @@ namespace Ryujinx.Ava.Ui.ViewModels

        public async void OpenAboutWindow()
        {
-            AboutWindow window = new();
-
-            await window.ShowDialog(_owner);
+            await new AboutWindow().ShowDialog(_owner);
        }

        public void ChangeLanguage(object obj)
@@ -1020,7 +1024,7 @@ namespace Ryujinx.Ava.Ui.ViewModels
            try
            {
                ProgressMaximum = total;
-                ProgressValue = current;
+                ProgressValue   = current;

                switch (state)
                {
@@ -1030,13 +1034,13 @@ namespace Ryujinx.Ava.Ui.ViewModels
                        {
                            case PtcLoadingState.Start:
                            case PtcLoadingState.Loading:
-                                LoadHeading = LocaleManager.Instance["CompilingPPTC"];
+                                LoadHeading            = LocaleManager.Instance["CompilingPPTC"];
                                IsLoadingIndeterminate = false;
                                break;
                            case PtcLoadingState.Loaded:
-                                LoadHeading = string.Format(LocaleManager.Instance["LoadingHeading"], TitleName);
+                                LoadHeading            = string.Format(LocaleManager.Instance["LoadingHeading"], TitleName);
                                IsLoadingIndeterminate = true;
-                                CacheLoadStatus = "";
+                                CacheLoadStatus        = "";
                                break;
                        }
                        break;
@@ -1046,13 +1050,13 @@ namespace Ryujinx.Ava.Ui.ViewModels
                        {
                            case ShaderCacheLoadingState.Start:
                            case ShaderCacheLoadingState.Loading:
-                                LoadHeading = LocaleManager.Instance["CompilingShaders"];
+                                LoadHeading            = LocaleManager.Instance["CompilingShaders"];
                                IsLoadingIndeterminate = false;
                                break;
                            case ShaderCacheLoadingState.Loaded:
-                                LoadHeading = string.Format(LocaleManager.Instance["LoadingHeading"], TitleName);
+                                LoadHeading            = string.Format(LocaleManager.Instance["LoadingHeading"], TitleName);
                                IsLoadingIndeterminate = true;
-                                CacheLoadStatus = "";
+                                CacheLoadStatus        = "";
                                break;
                        }
                        break;
@@ -1065,14 +1069,12 @@ namespace Ryujinx.Ava.Ui.ViewModels

        public void OpenUserSaveDirectory()
        {
-            var selection = SelectedApplication;
-
+            ApplicationData selection = SelectedApplication;
            if (selection != null)
            {
                Task.Run(() =>
                {
-                    if (!ulong.TryParse(selection.TitleId, NumberStyles.HexNumber, CultureInfo.InvariantCulture,
-                    out ulong titleIdNumber))
+                    if (!ulong.TryParse(selection.TitleId, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out ulong titleIdNumber))
                    {
                        Dispatcher.UIThread.Post(async () =>
                        {
@@ -1082,8 +1084,8 @@ namespace Ryujinx.Ava.Ui.ViewModels
                        return;
                    }

-                    var userId = new LibHac.Fs.UserId((ulong)_owner.AccountManager.LastOpenedUser.UserId.High, (ulong)_owner.AccountManager.LastOpenedUser.UserId.Low);
-                    var saveDataFilter = SaveDataFilter.Make(titleIdNumber, saveType: default, userId, saveDataId: default, index: default);
+                    UserId         userId         = new((ulong)_owner.AccountManager.LastOpenedUser.UserId.High, (ulong)_owner.AccountManager.LastOpenedUser.UserId.Low);
+                    SaveDataFilter saveDataFilter = SaveDataFilter.Make(titleIdNumber, saveType: default, userId, saveDataId: default, index: default);
                    OpenSaveDirectory(in saveDataFilter, selection, titleIdNumber);
                });
            }
@@ -1091,8 +1093,7 @@ namespace Ryujinx.Ava.Ui.ViewModels

        public void ToggleFavorite()
        {
-            var selection = SelectedApplication;
-
+            ApplicationData selection = SelectedApplication;
            if (selection != null)
            {
                selection.Favorite = !selection.Favorite;
@@ -1108,11 +1109,10 @@ namespace Ryujinx.Ava.Ui.ViewModels

        public void OpenModsDirectory()
        {
-            var selection = SelectedApplication;
-
+            ApplicationData selection = SelectedApplication;
            if (selection != null)
            {
-                string modsBasePath = _owner.VirtualFileSystem.ModLoader.GetModsBasePath();
+                string modsBasePath  = _owner.VirtualFileSystem.ModLoader.GetModsBasePath();
                string titleModsPath = _owner.VirtualFileSystem.ModLoader.GetTitleDir(modsBasePath, selection.TitleId);

                OpenHelper.OpenFolder(titleModsPath);
@@ -1121,12 +1121,12 @@ namespace Ryujinx.Ava.Ui.ViewModels

        public void OpenSdModsDirectory()
        {
-            var selection = SelectedApplication;
+            ApplicationData selection = SelectedApplication;

            if (selection != null)
            {
                string sdModsBasePath = _owner.VirtualFileSystem.ModLoader.GetSdModsBasePath();
-                string titleModsPath = _owner.VirtualFileSystem.ModLoader.GetTitleDir(sdModsBasePath, selection.TitleId);
+                string titleModsPath  = _owner.VirtualFileSystem.ModLoader.GetTitleDir(sdModsBasePath, selection.TitleId);

                OpenHelper.OpenFolder(titleModsPath);
            }
@@ -1134,13 +1134,11 @@ namespace Ryujinx.Ava.Ui.ViewModels

        public void OpenPtcDirectory()
        {
-            var selection = SelectedApplication;
-
+            ApplicationData selection = SelectedApplication;
            if (selection != null)
            {
-                string ptcDir = Path.Combine(AppDataManager.GamesDirPath, selection.TitleId, "cache", "cpu");
-
-                string mainPath = Path.Combine(ptcDir, "0");
+                string ptcDir     = Path.Combine(AppDataManager.GamesDirPath, selection.TitleId, "cache", "cpu");
+                string mainPath   = Path.Combine(ptcDir, "0");
                string backupPath = Path.Combine(ptcDir, "1");

                if (!Directory.Exists(ptcDir))
@@ -1156,16 +1154,18 @@ namespace Ryujinx.Ava.Ui.ViewModels

        public async void PurgePtcCache()
        {
-            var selection = SelectedApplication;
-
+            ApplicationData selection = SelectedApplication;
            if (selection != null)
            {
-                DirectoryInfo mainDir = new(Path.Combine(AppDataManager.GamesDirPath, selection.TitleId, "cache", "cpu", "0"));
+                DirectoryInfo mainDir   = new(Path.Combine(AppDataManager.GamesDirPath, selection.TitleId, "cache", "cpu", "0"));
                DirectoryInfo backupDir = new(Path.Combine(AppDataManager.GamesDirPath, selection.TitleId, "cache", "cpu", "1"));

                // FIXME: Found a way to reproduce the bold effect on the title name (fork?).
-                UserResult result = await ContentDialogHelper.CreateConfirmationDialog(LocaleManager.Instance["DialogWarning"],
-                    string.Format(LocaleManager.Instance["DialogPPTCDeletionMessage"], selection.TitleName), LocaleManager.Instance["InputDialogYes"], LocaleManager.Instance["InputDialogNo"], LocaleManager.Instance["RyujinxConfirm"]);
+                UserResult result = await ContentDialogHelper.CreateConfirmationDialog(LocaleManager.Instance["DialogWarning"], 
+                                                                                       string.Format(LocaleManager.Instance["DialogPPTCDeletionMessage"], selection.TitleName),
+                                                                                       LocaleManager.Instance["InputDialogYes"],
+                                                                                       LocaleManager.Instance["InputDialogNo"],
+                                                                                       LocaleManager.Instance["RyujinxConfirm"]);

                List<FileInfo> cacheFiles = new();

@@ -1198,8 +1198,7 @@ namespace Ryujinx.Ava.Ui.ViewModels

        public void OpenShaderCacheDirectory()
        {
-            var selection = SelectedApplication;
-
+            ApplicationData selection = SelectedApplication;
            if (selection != null)
            {
                string shaderCacheDir = Path.Combine(AppDataManager.GamesDirPath, selection.TitleId, "cache", "shader");
@@ -1220,18 +1219,20 @@ namespace Ryujinx.Ava.Ui.ViewModels

        public async void PurgeShaderCache()
        {
-            var selection = SelectedApplication;
-
+            ApplicationData selection = SelectedApplication;
            if (selection != null)
            {
                DirectoryInfo shaderCacheDir = new(Path.Combine(AppDataManager.GamesDirPath, selection.TitleId, "cache", "shader"));

                // FIXME: Found a way to reproduce the bold effect on the title name (fork?).
                UserResult result = await ContentDialogHelper.CreateConfirmationDialog(LocaleManager.Instance["DialogWarning"],
-                    string.Format(LocaleManager.Instance["DialogShaderDeletionMessage"], selection.TitleName), LocaleManager.Instance["InputDialogYes"], LocaleManager.Instance["InputDialogNo"], LocaleManager.Instance["RyujinxConfirm"]);
+                                                                                       string.Format(LocaleManager.Instance["DialogShaderDeletionMessage"], selection.TitleName),
+                                                                                       LocaleManager.Instance["InputDialogYes"],
+                                                                                       LocaleManager.Instance["InputDialogNo"],
+                                                                                       LocaleManager.Instance["RyujinxConfirm"]);

-                List<DirectoryInfo> oldCacheDirectories = new List<DirectoryInfo>();
-                List<FileInfo> newCacheFiles = new List<FileInfo>();
+                List<DirectoryInfo> oldCacheDirectories = new();
+                List<FileInfo>      newCacheFiles       = new();

                if (shaderCacheDir.Exists)
                {
@@ -1279,38 +1280,28 @@ namespace Ryujinx.Ava.Ui.ViewModels

        public async void OpenTitleUpdateManager()
        {
-            var selection = SelectedApplication;
-
+            ApplicationData selection = SelectedApplication;
            if (selection != null)
            {
-                TitleUpdateWindow titleUpdateManager =
-                    new(_owner.VirtualFileSystem, selection.TitleId, selection.TitleName);
-
-                await titleUpdateManager.ShowDialog(_owner);
+                await new TitleUpdateWindow(_owner.VirtualFileSystem, selection.TitleId, selection.TitleName).ShowDialog(_owner);
            }
        }

        public async void OpenDownloadableContentManager()
        {
-            var selection = SelectedApplication;
-
+            ApplicationData selection = SelectedApplication;
            if (selection != null)
            {
-                DownloadableContentManagerWindow downloadableContentManager = new(_owner.VirtualFileSystem, ulong.Parse(selection.TitleId, NumberStyles.HexNumber), selection.TitleName);
-
-                await downloadableContentManager.ShowDialog(_owner);
+                await new DownloadableContentManagerWindow(_owner.VirtualFileSystem, ulong.Parse(selection.TitleId, NumberStyles.HexNumber), selection.TitleName).ShowDialog(_owner);
            }
        }

        public async void OpenCheatManager()
        {
-            var selection = SelectedApplication;
-
+            ApplicationData selection = SelectedApplication;
            if (selection != null)
            {
-                CheatWindow cheatManager = new(_owner.VirtualFileSystem, selection.TitleId, selection.TitleName);
-
-                await cheatManager.ShowDialog(_owner);
+                await new CheatWindow(_owner.VirtualFileSystem, selection.TitleId, selection.TitleName).ShowDialog(_owner);
            }
        }

@@ -1321,13 +1312,10 @@ namespace Ryujinx.Ava.Ui.ViewModels
                return;
            }

-            var application = _owner.AppHost.Device.Application;
-
+            ApplicationLoader application = _owner.AppHost.Device.Application;
            if (application != null)
            {
-                CheatWindow cheatManager = new(_owner.VirtualFileSystem, application.TitleIdText, application.TitleName);
-
-                await cheatManager.ShowDialog(_owner);
+                await new CheatWindow(_owner.VirtualFileSystem, application.TitleIdText, application.TitleName).ShowDialog(_owner);

                _owner.AppHost.Device.EnableCheats();
            }
@@ -1335,14 +1323,12 @@ namespace Ryujinx.Ava.Ui.ViewModels

        public void OpenDeviceSaveDirectory()
        {
-            var selection = SelectedApplication;
-
+            ApplicationData selection = SelectedApplication;
            if (selection != null)
            {
                Task.Run(() =>
                {
-                    if (!ulong.TryParse(selection.TitleId, NumberStyles.HexNumber, CultureInfo.InvariantCulture,
-                        out ulong titleIdNumber))
+                    if (!ulong.TryParse(selection.TitleId, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out ulong titleIdNumber))
                    {
                        Dispatcher.UIThread.Post(async () =>
                        {
@@ -1360,14 +1346,12 @@ namespace Ryujinx.Ava.Ui.ViewModels

        public void OpenBcatSaveDirectory()
        {
-            var selection = SelectedApplication;
-
+            ApplicationData selection = SelectedApplication;
            if (selection != null)
            {
                Task.Run(() =>
                {
-                    if (!ulong.TryParse(selection.TitleId, NumberStyles.HexNumber, CultureInfo.InvariantCulture,
-                        out ulong titleIdNumber))
+                    if (!ulong.TryParse(selection.TitleId, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out ulong titleIdNumber))
                    {
                        Dispatcher.UIThread.Post(async () =>
                        {
@@ -1420,12 +1404,10 @@ namespace Ryujinx.Ava.Ui.ViewModels
            _owner.Close();
        }

-        private async Task HandleFirmwareInstallation(string path)
+        private async Task HandleFirmwareInstallation(string filename)
        {
            try
            {
-                string filename = path;
-
                SystemVersion firmwareVersion = _owner.ContentManager.VerifyFirmwarePackage(filename);

                if (firmwareVersion == null)
@@ -1437,7 +1419,6 @@ namespace Ryujinx.Ava.Ui.ViewModels

                string dialogTitle = string.Format(LocaleManager.Instance["DialogFirmwareInstallerFirmwareInstallTitle"], firmwareVersion.VersionString);

-
                SystemVersion currentVersion = _owner.ContentManager.GetCurrentFirmwareVersion();

                string dialogMessage = string.Format(LocaleManager.Instance["DialogFirmwareInstallerFirmwareInstallMessage"], firmwareVersion.VersionString);
@@ -1480,11 +1461,12 @@ namespace Ryujinx.Ava.Ui.ViewModels
                                string message = string.Format(LocaleManager.Instance["DialogFirmwareInstallerFirmwareInstallSuccessMessage"], firmwareVersion.VersionString);

                                await ContentDialogHelper.CreateInfoDialog(dialogTitle, message, LocaleManager.Instance["InputDialogOk"], "", LocaleManager.Instance["RyujinxInfo"]);
+
                                Logger.Info?.Print(LogClass.Application, message);

                                // Purge Applet Cache.

-                                DirectoryInfo miiEditorCacheFolder = new DirectoryInfo(System.IO.Path.Combine(AppDataManager.GamesDirPath, "0100000000001009", "cache"));
+                                DirectoryInfo miiEditorCacheFolder = new DirectoryInfo(Path.Combine(AppDataManager.GamesDirPath, "0100000000001009", "cache"));

                                if (miiEditorCacheFolder.Exists)
                                {
@@ -1514,8 +1496,8 @@ namespace Ryujinx.Ava.Ui.ViewModels
            catch (LibHac.Common.Keys.MissingKeyException ex)
            {
                Logger.Error?.Print(LogClass.Application, ex.ToString());
-                Dispatcher.UIThread.Post(async () => await
-                    UserErrorDialog.ShowUserErrorDialog(UserError.NoKeys, _owner));
+
+                Dispatcher.UIThread.Post(async () => await UserErrorDialog.ShowUserErrorDialog(UserError.NoKeys, _owner));
            }
            catch (Exception ex)
            {
@@ -1527,8 +1509,8 @@ namespace Ryujinx.Ava.Ui.ViewModels
        {
            OpenFileDialog dialog = new() { AllowMultiple = false };
            dialog.Filters.Add(new FileDialogFilter { Name = LocaleManager.Instance["FileDialogAllTypes"], Extensions = { "xci", "zip" } });
-            dialog.Filters.Add(new FileDialogFilter { Name = "XCI", Extensions = { "xci" } });
-            dialog.Filters.Add(new FileDialogFilter { Name = "ZIP", Extensions = { "zip" } });
+            dialog.Filters.Add(new FileDialogFilter { Name = "XCI",                                        Extensions = { "xci" } });
+            dialog.Filters.Add(new FileDialogFilter { Name = "ZIP",                                        Extensions = { "zip" } });

            string[] file = await dialog.ShowAsync(_owner);

--- a/Ryujinx.Ava/Ui/Windows/DownloadableContentManagerWindow.axaml
+++ b/Ryujinx.Ava/Ui/Windows/DownloadableContentManagerWindow.axaml
@@ -3,89 +3,126 @@
    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:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:window="clr-namespace:Ryujinx.Ava.Ui.Windows"
-    SizeToContent="Height"
-    Width="600" MinHeight="500" Height="500"
-    WindowStartupLocation="CenterOwner"
+    Width="800"
+    Height="500"
    MinWidth="600"
+    MinHeight="500"
+    SizeToContent="Height"
+    WindowStartupLocation="CenterOwner"
    mc:Ignorable="d">
    <Grid Name="DownloadableContentGrid" Margin="15">
        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
            <RowDefinition Height="Auto" />
            <RowDefinition Height="Auto" />
            <RowDefinition Height="*" />
            <RowDefinition Height="Auto" />
        </Grid.RowDefinitions>
        <TextBlock
+            Name="Heading"
            Grid.Row="1"
+            MaxWidth="500"
            Margin="20,15,20,20"
            HorizontalAlignment="Center"
            VerticalAlignment="Center"
-            MaxWidth="500"
            LineHeight="18"
-            TextWrapping="Wrap"
-            Text="{Binding Heading}"
-            TextAlignment="Center" />
-        <Border
+            TextAlignment="Center"
+            TextWrapping="Wrap" />
+        <DockPanel
            Grid.Row="2"
+            Margin="0"
+            HorizontalAlignment="Left">
+            <Button
+                Name="EnableAllButton"
+                MinWidth="90"
+                Margin="5"
+                Command="{Binding EnableAll}">
+                <TextBlock Text="{locale:Locale DlcManagerEnableAllButton}" />
+            </Button>
+            <Button
+                Name="DisableAllButton"
+                MinWidth="90"
+                Margin="5"
+                Command="{Binding DisableAll}">
+                <TextBlock Text="{locale:Locale DlcManagerDisableAllButton}" />
+            </Button>
+        </DockPanel>
+        <Border
+            Grid.Row="3"
            Margin="5"
            HorizontalAlignment="Stretch"
            VerticalAlignment="Stretch"
            BorderBrush="Gray"
            BorderThickness="1">
-            <DataGrid
-                MinHeight="200"
-                HorizontalAlignment="Stretch"
+            <ScrollViewer
                VerticalAlignment="Stretch"
                HorizontalScrollBarVisibility="Auto"
-                Items="{Binding DownloadableContents}"
                VerticalScrollBarVisibility="Auto">
-                <DataGrid.Columns>
-                    <DataGridTemplateColumn Width="90">
-                        <DataGridTemplateColumn.CellTemplate>
-                            <DataTemplate>
-                                <CheckBox
-                                    Width="50"
-                                    MinWidth="40"
-                                    HorizontalAlignment="Right"
-                                    IsChecked="{Binding Enabled}" />
-                            </DataTemplate>
-                        </DataGridTemplateColumn.CellTemplate>
-                        <DataGridTemplateColumn.Header>
-                            <TextBlock Text="{locale:Locale DlcManagerTableHeadingEnabledLabel}" />
-                        </DataGridTemplateColumn.Header>
-                    </DataGridTemplateColumn>
-                    <DataGridTextColumn
-                        Width="190"
-                        Binding="{Binding TitleId}"
-                        CanUserResize="True">
-                        <DataGridTextColumn.Header>
-                            <TextBlock Text="{locale:Locale DlcManagerTableHeadingTitleIdLabel}" />
-                        </DataGridTextColumn.Header>
-                    </DataGridTextColumn>
-                    <DataGridTextColumn
-                        Width="*"
-                        Binding="{Binding ContainerPath}"
-                        CanUserResize="True">
-                        <DataGridTextColumn.Header>
-                            <TextBlock Text="{locale:Locale DlcManagerTableHeadingContainerPathLabel}" />
-                        </DataGridTextColumn.Header>
-                    </DataGridTextColumn>
-                    <DataGridTextColumn
-                        Width="*"
-                        Binding="{Binding FullPath}"
-                        CanUserResize="True">
-                        <DataGridTextColumn.Header>
-                            <TextBlock Text="{locale:Locale DlcManagerTableHeadingFullPathLabel}" />
-                        </DataGridTextColumn.Header>
-                    </DataGridTextColumn>
-                </DataGrid.Columns>
-            </DataGrid>
+                <DataGrid
+                    Name="DlcDataGrid"
+                    MinHeight="200"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch"
+                    CanUserReorderColumns="False"
+                    CanUserResizeColumns="True"
+                    CanUserSortColumns="True"
+                    HorizontalScrollBarVisibility="Auto"
+                    Items="{Binding _downloadableContents}"
+                    SelectionMode="Extended"
+                    VerticalScrollBarVisibility="Auto">
+                    <DataGrid.Styles>
+                        <Styles>
+                            <Style Selector="DataGridCell:nth-child(3), DataGridCell:nth-child(4)">
+                                <Setter Property="HorizontalAlignment" Value="Left" />
+                                <Setter Property="HorizontalContentAlignment" Value="Left" />
+                            </Style>
+                        </Styles>
+                        <Styles>
+                            <Style Selector="DataGridCell:nth-child(1)">
+                                <Setter Property="HorizontalAlignment" Value="Right" />
+                                <Setter Property="HorizontalContentAlignment" Value="Right" />
+                            </Style>
+                        </Styles>
+                    </DataGrid.Styles>
+                    <DataGrid.Columns>
+                        <DataGridTemplateColumn Width="90">
+                            <DataGridTemplateColumn.CellTemplate>
+                                <DataTemplate>
+                                    <CheckBox
+                                        Width="50"
+                                        MinWidth="40"
+                                        HorizontalAlignment="Center"
+                                        IsChecked="{Binding Enabled}" />
+                                </DataTemplate>
+                            </DataGridTemplateColumn.CellTemplate>
+                            <DataGridTemplateColumn.Header>
+                                <TextBlock Text="{locale:Locale DlcManagerTableHeadingEnabledLabel}" />
+                            </DataGridTemplateColumn.Header>
+                        </DataGridTemplateColumn>
+                        <DataGridTextColumn Width="140" Binding="{Binding TitleId}">
+                            <DataGridTextColumn.Header>
+                                <TextBlock Text="{locale:Locale DlcManagerTableHeadingTitleIdLabel}" />
+                            </DataGridTextColumn.Header>
+                        </DataGridTextColumn>
+                        <DataGridTextColumn Width="280" Binding="{Binding FullPath}">
+                            <DataGridTextColumn.Header>
+                                <TextBlock Text="{locale:Locale DlcManagerTableHeadingFullPathLabel}" />
+                            </DataGridTextColumn.Header>
+                        </DataGridTextColumn>
+                        <DataGridTextColumn Binding="{Binding ContainerPath}">
+                            <DataGridTextColumn.Header>
+                                <TextBlock Text="{locale:Locale DlcManagerTableHeadingContainerPathLabel}" />
+                            </DataGridTextColumn.Header>
+                        </DataGridTextColumn>
+                    </DataGrid.Columns>
+                </DataGrid>
+            </ScrollViewer>
        </Border>
        <DockPanel
-            Grid.Row="3"
+            Grid.Row="4"
            Margin="0"
            HorizontalAlignment="Stretch">
            <DockPanel Margin="0" HorizontalAlignment="Left">
--- a/Ryujinx.Ava/Ui/Windows/DownloadableContentManagerWindow.axaml.cs
+++ b/Ryujinx.Ava/Ui/Windows/DownloadableContentManagerWindow.axaml.cs
@@ -8,6 +8,7 @@ using LibHac.FsSystem;
 using LibHac.Tools.Fs;
 using LibHac.Tools.FsSystem;
 using LibHac.Tools.FsSystem.NcaUtils;
+using LibHac.Tools.FsSystem.Save;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Ui.Controls;
 using Ryujinx.Ava.Ui.Models;
@@ -16,8 +17,11 @@ using Ryujinx.Common.Utilities;
 using Ryujinx.HLE.FileSystem;
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.IO;
 using System.Linq;
+using System.Reactive.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Path = System.IO.Path;
@@ -27,14 +31,13 @@ namespace Ryujinx.Ava.Ui.Windows
    public partial class DownloadableContentManagerWindow : StyleableWindow
    {
        private readonly List<DownloadableContentContainer> _downloadableContentContainerList;
-        private readonly string _downloadableContentJsonPath;
+        private readonly string                             _downloadableContentJsonPath;

-        public VirtualFileSystem VirtualFileSystem { get; }
-        public AvaloniaList<DownloadableContentModel> DownloadableContents { get; set; } = new AvaloniaList<DownloadableContentModel>();
-        public ulong TitleId { get; }
-        public string TitleName { get; }
+        private VirtualFileSystem                      _virtualFileSystem    { get; }
+        private AvaloniaList<DownloadableContentModel> _downloadableContents { get; set; }

-        public string Heading => string.Format(LocaleManager.Instance["DlcWindowHeading"], TitleName, TitleId.ToString("X16"));
+        private ulong  TitleId   { get; }
+        private string TitleName { get; }

        public DownloadableContentManagerWindow()
        {
@@ -42,14 +45,15 @@ namespace Ryujinx.Ava.Ui.Windows

            InitializeComponent();

-            Title = $"Ryujinx {Program.Version} - " + LocaleManager.Instance["DlcWindowTitle"];
+            Title = $"Ryujinx {Program.Version} - {LocaleManager.Instance["DlcWindowTitle"]} - {TitleName} ({TitleId:X16})";
        }

        public DownloadableContentManagerWindow(VirtualFileSystem virtualFileSystem, ulong titleId, string titleName)
        {
-            VirtualFileSystem = virtualFileSystem;
-            TitleId           = titleId;
-            TitleName         = titleName;
+            _virtualFileSystem    = virtualFileSystem;
+            _downloadableContents = new AvaloniaList<DownloadableContentModel>();
+            TitleId               = titleId;
+            TitleName             = titleName;

            _downloadableContentJsonPath = Path.Combine(AppDataManager.GamesDirPath, titleId.ToString("x16"), "dlc.json");

@@ -66,9 +70,24 @@ namespace Ryujinx.Ava.Ui.Windows

            InitializeComponent();

-            Title = $"Ryujinx {Program.Version} - " + LocaleManager.Instance["DlcWindowTitle"];
+            RemoveButton.IsEnabled = false;
+
+            DlcDataGrid.SelectionChanged += DlcDataGrid_SelectionChanged;
+
+            Title = $"Ryujinx {Program.Version} - {LocaleManager.Instance["DlcWindowTitle"]} - {TitleName} ({TitleId:X16})";

            LoadDownloadableContents();
+            PrintHeading();
+        }
+
+        private void DlcDataGrid_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            RemoveButton.IsEnabled = (DlcDataGrid.SelectedItems.Count > 0);
+        }
+
+        private void PrintHeading()
+        {
+            Heading.Text = string.Format(LocaleManager.Instance["DlcWindowHeading"], _downloadableContents.Count, TitleName, TitleId.ToString("X16"));
        }

        private void LoadDownloadableContents()
@@ -79,23 +98,23 @@ namespace Ryujinx.Ava.Ui.Windows
                {
                    using FileStream containerFile = File.OpenRead(downloadableContentContainer.ContainerPath);

-                    PartitionFileSystem pfs = new PartitionFileSystem(containerFile.AsStorage());
+                    PartitionFileSystem pfs = new(containerFile.AsStorage());

-                    VirtualFileSystem.ImportTickets(pfs);
+                    _virtualFileSystem.ImportTickets(pfs);

                    foreach (DownloadableContentNca downloadableContentNca in downloadableContentContainer.DownloadableContentNcaList)
                    {
-                        using var ncaFile = new UniqueRef<IFile>();
+                        using UniqueRef<IFile> ncaFile = new();

                        pfs.OpenFile(ref ncaFile.Ref(), downloadableContentNca.FullPath.ToU8Span(), OpenMode.Read).ThrowIfFailure();

-                        Nca nca = TryCreateNca(ncaFile.Get.AsStorage(), downloadableContentContainer.ContainerPath);
+                        Nca nca = TryOpenNca(ncaFile.Get.AsStorage(), downloadableContentContainer.ContainerPath);
                        if (nca != null)
                        {
-                            DownloadableContents.Add(new DownloadableContentModel(nca.Header.TitleId.ToString("X16"),
-                                                                                  downloadableContentContainer.ContainerPath,
-                                                                                  downloadableContentNca.FullPath,
-                                                                                  downloadableContentNca.Enabled));
+                            _downloadableContents.Add(new DownloadableContentModel(nca.Header.TitleId.ToString("X16"),
+                                                                                   downloadableContentContainer.ContainerPath,
+                                                                                   downloadableContentNca.FullPath,
+                                                                                   downloadableContentNca.Enabled));
                        }
                    }
                }
@@ -105,11 +124,11 @@ namespace Ryujinx.Ava.Ui.Windows
            Save();
        }

-        private Nca TryCreateNca(IStorage ncaStorage, string containerPath)
+        private Nca TryOpenNca(IStorage ncaStorage, string containerPath)
        {
            try
            {
-                return new Nca(VirtualFileSystem.KeySet, ncaStorage);
+                return new Nca(_virtualFileSystem.KeySet, ncaStorage);
            }
            catch (Exception ex)
            {
@@ -124,61 +143,73 @@ namespace Ryujinx.Ava.Ui.Windows

        private async Task AddDownloadableContent(string path)
        {
-            if (!File.Exists(path) || DownloadableContents.FirstOrDefault(x => x.ContainerPath == path) != null)
+            if (!File.Exists(path) || _downloadableContents.FirstOrDefault(x => x.ContainerPath == path) != null)
            {
                return;
            }

-            using (FileStream containerFile = File.OpenRead(path))
+            using FileStream containerFile = File.OpenRead(path);
+
+            PartitionFileSystem partitionFileSystem         = new(containerFile.AsStorage());
+            bool                containsDownloadableContent = false;
+
+            _virtualFileSystem.ImportTickets(partitionFileSystem);
+
+            foreach (DirectoryEntryEx fileEntry in partitionFileSystem.EnumerateEntries("/", "*.nca"))
            {
-                PartitionFileSystem pfs = new PartitionFileSystem(containerFile.AsStorage());
-                bool containsDownloadableContent = false;
+                using var ncaFile = new UniqueRef<IFile>();

-                VirtualFileSystem.ImportTickets(pfs);
+                partitionFileSystem.OpenFile(ref ncaFile.Ref(), fileEntry.FullPath.ToU8Span(), OpenMode.Read).ThrowIfFailure();

-                foreach (DirectoryEntryEx fileEntry in pfs.EnumerateEntries("/", "*.nca"))
+                Nca nca = TryOpenNca(ncaFile.Get.AsStorage(), path);
+                if (nca == null)
                {
-                    using var ncaFile = new UniqueRef<IFile>();
-
-                    pfs.OpenFile(ref ncaFile.Ref(), fileEntry.FullPath.ToU8Span(), OpenMode.Read).ThrowIfFailure();
-
-                    Nca nca = TryCreateNca(ncaFile.Get.AsStorage(), path);
-
-                    if (nca == null)
-                    {
-                        continue;
-                    }
-
-                    if (nca.Header.ContentType == NcaContentType.PublicData)
-                    {
-                        if ((nca.Header.TitleId & 0xFFFFFFFFFFFFE000) != TitleId)
-                        {
-                            break;
-                        }
-
-                        DownloadableContents.Add(new DownloadableContentModel(nca.Header.TitleId.ToString("X16"), path, fileEntry.FullPath, true));
-
-                        containsDownloadableContent = true;
-                    }
+                    continue;
                }

-                if (!containsDownloadableContent)
+                if (nca.Header.ContentType == NcaContentType.PublicData)
                {
-                    await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance["DialogDlcNoDlcErrorMessage"]);
+                    if ((nca.Header.TitleId & 0xFFFFFFFFFFFFE000) != TitleId)
+                    {
+                        break;
+                    }
+
+                    _downloadableContents.Add(new DownloadableContentModel(nca.Header.TitleId.ToString("X16"), path, fileEntry.FullPath, true));
+
+                    containsDownloadableContent = true;
                }
            }
+
+            if (!containsDownloadableContent)
+            {
+                await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance["DialogDlcNoDlcErrorMessage"]);
+            }
        }

        private void RemoveDownloadableContents(bool removeSelectedOnly = false)
        {
            if (removeSelectedOnly)
            {
-                DownloadableContents.RemoveAll(DownloadableContents.Where(x => x.Enabled).ToList());
+                AvaloniaList<DownloadableContentModel> removedItems = new();
+
+                foreach (var item in DlcDataGrid.SelectedItems)
+                {
+                    removedItems.Add(item as DownloadableContentModel);
+                }
+
+                DlcDataGrid.SelectedItems.Clear();
+
+                foreach (var item in removedItems)
+                {
+                    _downloadableContents.RemoveAll(_downloadableContents.Where(x => x.TitleId == item.TitleId).ToList());
+                }
            }
            else
            {
-                DownloadableContents.Clear();
+                _downloadableContents.Clear();
            }
+
+            PrintHeading();
        }

        public void RemoveSelected()
@@ -191,6 +222,22 @@ namespace Ryujinx.Ava.Ui.Windows
            RemoveDownloadableContents();
        }

+        public void EnableAll()
+        {
+            foreach(var item in _downloadableContents)
+            {
+                item.Enabled = true;
+            }
+        }
+
+        public void DisableAll()
+        {
+            foreach (var item in _downloadableContents)
+            {
+                item.Enabled = false;
+            }
+        }
+
        public async void Add()
        {
            OpenFileDialog dialog = new OpenFileDialog()
@@ -214,6 +261,8 @@ namespace Ryujinx.Ava.Ui.Windows
                   await AddDownloadableContent(file);
                }
            }
+
+            PrintHeading();
        }

        public void Save()
@@ -222,7 +271,7 @@ namespace Ryujinx.Ava.Ui.Windows

            DownloadableContentContainer container = default;

-            foreach (DownloadableContentModel downloadableContent in DownloadableContents)
+            foreach (DownloadableContentModel downloadableContent in _downloadableContents)
            {
                if (container.ContainerPath != downloadableContent.ContainerPath)
                {
--- a/Ryujinx.Ava/Ui/Windows/MainWindow.axaml.cs
+++ b/Ryujinx.Ava/Ui/Windows/MainWindow.axaml.cs
@@ -90,8 +90,8 @@ namespace Ryujinx.Ava.Ui.Windows

            Title = $"Ryujinx {Program.Version}";

-            Height = Height / Program.WindowScaleFactor;
-            Width = Width / Program.WindowScaleFactor;
+            Height /= Program.WindowScaleFactor;
+            Width /= Program.WindowScaleFactor;

            if (Program.PreviewerDetached)
            {
@@ -251,24 +251,29 @@ namespace Ryujinx.Ava.Ui.Windows

            AppHost = new AppHost(RendererControl, InputManager, path, VirtualFileSystem, ContentManager, AccountManager, _userChannelPersistence, this);

-            if (!AppHost.LoadGuestApplication().Result)
+            Dispatcher.UIThread.Post(async () =>
            {
-                AppHost.DisposeContext();
+                if (!await AppHost.LoadGuestApplication())
+                {
+                    AppHost.DisposeContext();
+                    AppHost = null;

-                return;
-            }
+                    return;
+                }

-            ViewModel.LoadHeading = string.IsNullOrWhiteSpace(titleName) ? string.Format(LocaleManager.Instance["LoadingHeading"], AppHost.Device.Application.TitleName) : titleName;
-            ViewModel.TitleName = string.IsNullOrWhiteSpace(titleName) ? AppHost.Device.Application.TitleName : titleName;
+                ViewModel.LoadHeading = string.IsNullOrWhiteSpace(titleName) ? string.Format(LocaleManager.Instance["LoadingHeading"], AppHost.Device.Application.TitleName) : titleName;
+                ViewModel.TitleName   = string.IsNullOrWhiteSpace(titleName) ? AppHost.Device.Application.TitleName : titleName;

-            SwitchToGameControl(startFullscreen);
+                SwitchToGameControl(startFullscreen);

-            _currentEmulatedGamePath = path;
-            Thread gameThread = new Thread(InitializeGame)
-            {
-                Name = "GUI.WindowThread"
-            };
-            gameThread.Start();
+                _currentEmulatedGamePath = path;
+
+                Thread gameThread = new(InitializeGame)
+                {
+                    Name = "GUI.WindowThread"
+                };
+                gameThread.Start();
+            });
        }

        private void InitializeGame()
@@ -518,23 +523,20 @@ namespace Ryujinx.Ava.Ui.Windows

        public static void UpdateGraphicsConfig()
        {
-            int resScale = ConfigurationState.Instance.Graphics.ResScale;
-            float resScaleCustom = ConfigurationState.Instance.Graphics.ResScaleCustom;
-
-            GraphicsConfig.ResScale = resScale == -1 ? resScaleCustom : resScale;
-            GraphicsConfig.MaxAnisotropy = ConfigurationState.Instance.Graphics.MaxAnisotropy;
-            GraphicsConfig.ShadersDumpPath = ConfigurationState.Instance.Graphics.ShadersDumpPath;
-            GraphicsConfig.EnableShaderCache = ConfigurationState.Instance.Graphics.EnableShaderCache;
+            GraphicsConfig.ResScale                   = ConfigurationState.Instance.Graphics.ResScale == -1 ? ConfigurationState.Instance.Graphics.ResScaleCustom : ConfigurationState.Instance.Graphics.ResScale;
+            GraphicsConfig.MaxAnisotropy              = ConfigurationState.Instance.Graphics.MaxAnisotropy;
+            GraphicsConfig.ShadersDumpPath            = ConfigurationState.Instance.Graphics.ShadersDumpPath;
+            GraphicsConfig.EnableShaderCache          = ConfigurationState.Instance.Graphics.EnableShaderCache;
            GraphicsConfig.EnableTextureRecompression = ConfigurationState.Instance.Graphics.EnableTextureRecompression;
-            GraphicsConfig.EnableMacroHLE = ConfigurationState.Instance.Graphics.EnableMacroHLE;
+            GraphicsConfig.EnableMacroHLE             = ConfigurationState.Instance.Graphics.EnableMacroHLE;
        }

        public void LoadHotKeys()
        {
-            HotKeyManager.SetHotKey(FullscreenHotKey, new KeyGesture(Key.Enter, KeyModifiers.Alt));
+            HotKeyManager.SetHotKey(FullscreenHotKey,  new KeyGesture(Key.Enter, KeyModifiers.Alt));
            HotKeyManager.SetHotKey(FullscreenHotKey2, new KeyGesture(Key.F11));
-            HotKeyManager.SetHotKey(DockToggleHotKey, new KeyGesture(Key.F9));
-            HotKeyManager.SetHotKey(ExitHotKey, new KeyGesture(Key.Escape));
+            HotKeyManager.SetHotKey(DockToggleHotKey,  new KeyGesture(Key.F9));
+            HotKeyManager.SetHotKey(ExitHotKey,        new KeyGesture(Key.Escape));
        }

        public static void SaveConfig()
@@ -546,10 +548,12 @@ namespace Ryujinx.Ava.Ui.Windows
        {
            ApplicationLibrary.LoadAndSaveMetaData(titleId, appMetadata =>
            {
-                DateTime lastPlayedDateTime = DateTime.Parse(appMetadata.LastPlayed);
-                double sessionTimePlayed = DateTime.UtcNow.Subtract(lastPlayedDateTime).TotalSeconds;
+                if (DateTime.TryParse(appMetadata.LastPlayed, out DateTime lastPlayedDateTime))
+                {
+                    double sessionTimePlayed = DateTime.UtcNow.Subtract(lastPlayedDateTime).TotalSeconds;

-                appMetadata.TimePlayed += Math.Round(sessionTimePlayed, MidpointRounding.AwayFromZero);
+                    appMetadata.TimePlayed += Math.Round(sessionTimePlayed, MidpointRounding.AwayFromZero);
+                }
            });
        }

--- a/Ryujinx.Ava/Ui/Windows/SettingsWindow.axaml
+++ b/Ryujinx.Ava/Ui/Windows/SettingsWindow.axaml
@@ -75,7 +75,7 @@
                            Spacing="10">
                            <ListBox
                                Name="GameList"
-                                MinHeight="150"
+                                MinHeight="250"
                                Items="{Binding GameDirectories}" />
                            <Grid HorizontalAlignment="Stretch">
                                <Grid.ColumnDefinitions>
--- a/Ryujinx.Ava/Ui/Windows/SettingsWindow.axaml.cs
+++ b/Ryujinx.Ava/Ui/Windows/SettingsWindow.axaml.cs
@@ -16,7 +16,6 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Threading.Tasks;
 using TimeZone = Ryujinx.Ava.Ui.Models.TimeZone;

 namespace Ryujinx.Ava.Ui.Windows
@@ -31,7 +30,7 @@ namespace Ryujinx.Ava.Ui.Windows
        {
            Title = $"Ryujinx {Program.Version} - {LocaleManager.Instance["Settings"]}";

-            ViewModel = new SettingsViewModel(virtualFileSystem, contentManager, this);
+            ViewModel   = new SettingsViewModel(virtualFileSystem, contentManager, this);
            DataContext = ViewModel;

            InitializeComponent();
@@ -48,7 +47,7 @@ namespace Ryujinx.Ava.Ui.Windows

        public SettingsWindow()
        {
-            ViewModel = new SettingsViewModel();
+            ViewModel   = new SettingsViewModel();
            DataContext = ViewModel;

            InitializeComponent();
@@ -79,7 +78,7 @@ namespace Ryujinx.Ava.Ui.Windows

                    PointerPressed += MouseClick;

-                    IKeyboard keyboard = (IKeyboard)ViewModel.AvaloniaKeyboardDriver.GetGamepad(ViewModel.AvaloniaKeyboardDriver.GamepadsIds[0]);
+                    IKeyboard       keyboard = (IKeyboard)ViewModel.AvaloniaKeyboardDriver.GetGamepad(ViewModel.AvaloniaKeyboardDriver.GamepadsIds[0]);
                    IButtonAssigner assigner = new KeyboardKeyAssigner(keyboard);

                    _currentAssigner.GetInputAndAssign(assigner);
@@ -92,6 +91,7 @@ namespace Ryujinx.Ava.Ui.Windows

                        _currentAssigner.Cancel();
                        _currentAssigner = null;
+
                        button.IsChecked = false;
                    }
                }
@@ -122,36 +122,19 @@ namespace Ryujinx.Ava.Ui.Windows
        {
            if (e.SelectedItem is NavigationViewItem navitem)
            {
-                switch (navitem.Tag.ToString())
+                NavPanel.Content = navitem.Tag.ToString() switch
                {
-                    case "UiPage":
-                        NavPanel.Content = UiPage;
-                        break;
-                    case "InputPage":
-                        NavPanel.Content = InputPage;
-                        break;
-                    case "HotkeysPage":
-                        NavPanel.Content = HotkeysPage;
-                        break;
-                    case "SystemPage":
-                        NavPanel.Content = SystemPage;
-                        break;
-                    case "CpuPage":
-                        NavPanel.Content = CpuPage;
-                        break;
-                    case "GraphicsPage":
-                        NavPanel.Content = GraphicsPage;
-                        break;
-                    case "AudioPage":
-                        NavPanel.Content = AudioPage;
-                        break;
-                    case "NetworkPage":
-                        NavPanel.Content = NetworkPage;
-                        break;
-                    case "LoggingPage":
-                        NavPanel.Content = LoggingPage;
-                        break;
-                }
+                    "UiPage"       => UiPage,
+                    "InputPage"    => InputPage,
+                    "HotkeysPage"  => HotkeysPage,
+                    "SystemPage"   => SystemPage,
+                    "CpuPage"      => CpuPage,
+                    "GraphicsPage" => GraphicsPage,
+                    "AudioPage"    => AudioPage,
+                    "NetworkPage"  => NetworkPage,
+                    "LoggingPage"  => LoggingPage,
+                    _              => throw new NotImplementedException()
+                };
            }
        }

@@ -178,13 +161,18 @@ namespace Ryujinx.Ava.Ui.Windows

        private void RemoveButton_OnClick(object sender, RoutedEventArgs e)
        {
-            List<string> selected = new(GameList.SelectedItems.Cast<string>());
+            int oldIndex = GameList.SelectedIndex;

-            foreach (string path in selected)
+            foreach (string path in new List<string>(GameList.SelectedItems.Cast<string>()))
            {
                ViewModel.GameDirectories.Remove(path);
                ViewModel.DirectoryChanged = true;
            }
+
+            if (GameList.ItemCount > 0)
+            {
+                GameList.SelectedIndex = oldIndex < GameList.ItemCount ? oldIndex : 0;
+            }
        }

        private void TimeZoneBox_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
@@ -214,7 +202,6 @@ namespace Ryujinx.Ava.Ui.Windows
        private void SaveButton_Clicked(object sender, RoutedEventArgs e)
        {
            SaveSettings();
-
            Close();
        }

@@ -232,7 +219,6 @@ namespace Ryujinx.Ava.Ui.Windows
        private void SaveSettings()
        {
            ViewModel.SaveSettings();
-
            ControllerSettings?.SaveCurrentProfile();

            if (Owner is MainWindow window && ViewModel.DirectoryChanged)
@@ -246,8 +232,10 @@ namespace Ryujinx.Ava.Ui.Windows
        protected override void OnClosed(EventArgs e)
        {
            ControllerSettings.Dispose();
+
            _currentAssigner?.Cancel();
            _currentAssigner = null;
+            
            base.OnClosed(e);
        }
    }
--- a/Ryujinx.Ava/Ui/Windows/TitleUpdateWindow.axaml.cs
+++ b/Ryujinx.Ava/Ui/Windows/TitleUpdateWindow.axaml.cs
@@ -131,6 +131,13 @@ namespace Ryujinx.Ava.Ui.Windows
                            nacpFile.Get.Read(out _, 0, SpanHelpers.AsByteSpan(ref controlData), ReadOption.None).ThrowIfFailure();

                            TitleUpdates.Add(new TitleUpdateModel(controlData, path));
+
+                            foreach (var update in TitleUpdates)
+                            {
+                                update.IsEnabled = false;
+                            }
+
+                            TitleUpdates.Last().IsEnabled = true;
                        }
                        else
                        {
--- a/Ryujinx.Common/Extensions/BinaryReaderExtensions.cs
+++ b/Ryujinx.Common/Extensions/BinaryReaderExtensions.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

 namespace Ryujinx.Common
@@ -7,49 +8,15 @@ namespace Ryujinx.Common
    public static class BinaryReaderExtensions
    {
        public unsafe static T ReadStruct<T>(this BinaryReader reader)
-            where T : struct
+            where T : unmanaged
        {
-            int size = Marshal.SizeOf<T>();
-
-            byte[] data = reader.ReadBytes(size);
-
-            fixed (byte* ptr = data)
-            {
-                return Marshal.PtrToStructure<T>((IntPtr)ptr);
-            }
-        }
-
-        public unsafe static T[] ReadStructArray<T>(this BinaryReader reader, int count)
-            where T : struct
-        {
-            int size = Marshal.SizeOf<T>();
-
-            T[] result = new T[count];
-
-            for (int i = 0; i < count; i++)
-            {
-                byte[] data = reader.ReadBytes(size);
-
-                fixed (byte* ptr = data)
-                {
-                    result[i] = Marshal.PtrToStructure<T>((IntPtr)ptr);
-                }
-            }
-
-            return result;
+            return MemoryMarshal.Cast<byte, T>(reader.ReadBytes(Unsafe.SizeOf<T>()))[0];
        }

        public unsafe static void WriteStruct<T>(this BinaryWriter writer, T value)
-            where T : struct
+            where T : unmanaged
        {
-            long size = Marshal.SizeOf<T>();
-
-            byte[] data = new byte[size];
-
-            fixed (byte* ptr = data)
-            {
-                Marshal.StructureToPtr<T>(value, (IntPtr)ptr, false);
-            }
+            ReadOnlySpan<byte> data = MemoryMarshal.Cast<T, byte>(MemoryMarshal.CreateReadOnlySpan(ref value, 1));

            writer.Write(data);
        }
--- a/Ryujinx.Cpu/Jit/MemoryManager.cs
+++ b/Ryujinx.Cpu/Jit/MemoryManager.cs
@@ -180,6 +180,37 @@ namespace Ryujinx.Cpu.Jit
            WriteImpl(va, data);
        }

+        /// <inheritdoc/>
+        public bool WriteWithRedundancyCheck(ulong va, ReadOnlySpan<byte> data)
+        {
+            if (data.Length == 0)
+            {
+                return false;
+            }
+
+            SignalMemoryTracking(va, (ulong)data.Length, false);
+
+            if (IsContiguousAndMapped(va, data.Length))
+            {
+                var target = _backingMemory.GetSpan(GetPhysicalAddressInternal(va), data.Length);
+
+                bool changed = !data.SequenceEqual(target);
+
+                if (changed)
+                {
+                    data.CopyTo(target);
+                }
+
+                return changed;
+            }
+            else
+            {
+                WriteImpl(va, data);
+
+                return true;
+            }
+        }
+
        /// <summary>
        /// Writes data to CPU mapped memory.
        /// </summary>
--- a/Ryujinx.Cpu/Jit/MemoryManagerHostMapped.cs
+++ b/Ryujinx.Cpu/Jit/MemoryManagerHostMapped.cs
@@ -307,6 +307,34 @@ namespace Ryujinx.Cpu.Jit
            }
        }

+        /// <inheritdoc/>
+        public bool WriteWithRedundancyCheck(ulong va, ReadOnlySpan<byte> data)
+        {
+            try
+            {
+                SignalMemoryTracking(va, (ulong)data.Length, false);
+
+                Span<byte> target = _addressSpaceMirror.GetSpan(va, data.Length);
+                bool changed = !data.SequenceEqual(target);
+
+                if (changed)
+                {
+                    data.CopyTo(target);
+                }
+
+                return changed;
+            }
+            catch (InvalidMemoryRegionException)
+            {
+                if (_invalidAccessHandler == null || !_invalidAccessHandler(va))
+                {
+                    throw;
+                }
+
+                return true;
+            }
+        }
+
        /// <inheritdoc/>
        public ReadOnlySpan<byte> GetSpan(ulong va, int size, bool tracked = false)
        {
--- a/Ryujinx.Cpu/MemoryHelper.cs
+++ b/Ryujinx.Cpu/MemoryHelper.cs
@@ -1,6 +1,7 @@
 using Ryujinx.Memory;
 using System;
 using System.IO;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Text;

@@ -23,34 +24,18 @@ namespace Ryujinx.Cpu
            }
        }

-        public unsafe static T Read<T>(IVirtualMemoryManager memory, ulong position) where T : struct
+        public unsafe static T Read<T>(IVirtualMemoryManager memory, ulong position) where T : unmanaged
        {
-            long size = Marshal.SizeOf<T>();
-
-            byte[] data = new byte[size];
-
-            memory.Read(position, data);
-
-            fixed (byte* ptr = data)
-            {
-                return Marshal.PtrToStructure<T>((IntPtr)ptr);
-            }
+            return MemoryMarshal.Cast<byte, T>(memory.GetSpan(position, Unsafe.SizeOf<T>()))[0];
        }

-        public unsafe static ulong Write<T>(IVirtualMemoryManager memory, ulong position, T value) where T : struct
+        public unsafe static ulong Write<T>(IVirtualMemoryManager memory, ulong position, T value) where T : unmanaged
        {
-            long size = Marshal.SizeOf<T>();
-
-            byte[] data = new byte[size];
-
-            fixed (byte* ptr = data)
-            {
-                Marshal.StructureToPtr<T>(value, (IntPtr)ptr, false);
-            }
+            ReadOnlySpan<byte> data = MemoryMarshal.Cast<T, byte>(MemoryMarshal.CreateReadOnlySpan(ref value, 1));

            memory.Write(position, data);

-            return (ulong)size;
+            return (ulong)data.Length;
        }

        public static string ReadAsciiString(IVirtualMemoryManager memory, ulong position, long maxSize = -1)
--- a/Ryujinx.Graphics.GAL/Multithreading/ThreadedRenderer.cs
+++ b/Ryujinx.Graphics.GAL/Multithreading/ThreadedRenderer.cs
@@ -422,7 +422,11 @@ namespace Ryujinx.Graphics.GAL.Multithreading

            // Stop the GPU thread.
            _disposed = true;
-            _gpuThread.Join();
+
+            if (_gpuThread != null && _gpuThread.IsAlive)
+            {
+                _gpuThread.Join();
+            }

            // Dispose the renderer.
            _baseRenderer.Dispose();
@@ -435,4 +439,4 @@ namespace Ryujinx.Graphics.GAL.Multithreading
            Sync.Dispose();
        }
    }
-}
+}
--- a/Ryujinx.Graphics.Gpu/Engine/Threed/ConstantBufferUpdater.cs
+++ b/Ryujinx.Graphics.Gpu/Engine/Threed/ConstantBufferUpdater.cs
@@ -8,6 +8,8 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
    /// </summary>
    class ConstantBufferUpdater
    {
+        private const int UniformDataCacheSize = 512;
+
        private readonly GpuChannel _channel;
        private readonly DeviceStateWithShadow<ThreedClassState> _state;

@@ -16,6 +18,8 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
        private ulong _ubBeginCpuAddress = 0;
        private ulong _ubFollowUpAddress = 0;
        private ulong _ubByteCount = 0;
+        private int _ubIndex = 0;
+        private int[] _ubData = new int[UniformDataCacheSize];

        /// <summary>
        /// Creates a new instance of the constant buffer updater.
@@ -108,9 +112,16 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
            if (_ubFollowUpAddress != 0)
            {
                var memoryManager = _channel.MemoryManager;
-                memoryManager.Physical.BufferCache.ForceDirty(memoryManager, _ubFollowUpAddress - _ubByteCount, _ubByteCount);
+
+                Span<byte> data = MemoryMarshal.Cast<int, byte>(_ubData.AsSpan(0, (int)(_ubByteCount / 4)));
+
+                if (memoryManager.Physical.WriteWithRedundancyCheck(_ubBeginCpuAddress, data))
+                {
+                    memoryManager.Physical.BufferCache.ForceDirty(memoryManager, _ubFollowUpAddress - _ubByteCount, _ubByteCount);
+                }

                _ubFollowUpAddress = 0;
+                _ubIndex = 0;
            }
        }

@@ -124,7 +135,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed

            ulong address = uniformBuffer.Address.Pack() + (uint)uniformBuffer.Offset;

-            if (_ubFollowUpAddress != address)
+            if (_ubFollowUpAddress != address || _ubIndex == _ubData.Length)
            {
                FlushUboDirty();

@@ -132,8 +143,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
                _ubBeginCpuAddress = _channel.MemoryManager.Translate(address);
            }

-            var byteData = MemoryMarshal.Cast<int, byte>(MemoryMarshal.CreateSpan(ref argument, 1));
-            _channel.MemoryManager.Physical.WriteUntracked(_ubBeginCpuAddress + _ubByteCount, byteData);
+            _ubData[_ubIndex++] = argument;

            _ubFollowUpAddress = address + 4;
            _ubByteCount += 4;
@@ -153,7 +163,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed

            ulong size = (ulong)data.Length * 4;

-            if (_ubFollowUpAddress != address)
+            if (_ubFollowUpAddress != address || _ubIndex + data.Length > _ubData.Length)
            {
                FlushUboDirty();

@@ -161,8 +171,8 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
                _ubBeginCpuAddress = _channel.MemoryManager.Translate(address);
            }

-            var byteData = MemoryMarshal.Cast<int, byte>(data);
-            _channel.MemoryManager.Physical.WriteUntracked(_ubBeginCpuAddress + _ubByteCount, byteData);
+            data.CopyTo(_ubData.AsSpan(_ubIndex));
+            _ubIndex += data.Length;

            _ubFollowUpAddress = address + size;
            _ubByteCount += size;
--- a/Ryujinx.Graphics.Gpu/Memory/PhysicalMemory.cs
+++ b/Ryujinx.Graphics.Gpu/Memory/PhysicalMemory.cs
@@ -242,6 +242,19 @@ namespace Ryujinx.Graphics.Gpu.Memory
            WriteImpl(range, data, _cpuMemory.WriteUntracked);
        }

+        /// <summary>
+        /// Writes data to the application process, returning false if the data was not changed.
+        /// This triggers read memory tracking, as a redundancy check would be useless if the data is not up to date.
+        /// </summary>
+        /// <remarks>The memory manager can return that memory has changed when it hasn't to avoid expensive data copies.</remarks>
+        /// <param name="address">Address to write into</param>
+        /// <param name="data">Data to be written</param>
+        /// <returns>True if the data was changed, false otherwise</returns>
+        public bool WriteWithRedundancyCheck(ulong address, ReadOnlySpan<byte> data)
+        {
+            return _cpuMemory.WriteWithRedundancyCheck(address, data);
+        }
+
        private delegate void WriteCallback(ulong address, ReadOnlySpan<byte> data);

        /// <summary>
--- a/Ryujinx.Graphics.OpenGL/Queries/Counters.cs
+++ b/Ryujinx.Graphics.OpenGL/Queries/Counters.cs
@@ -54,4 +54,4 @@ namespace Ryujinx.Graphics.OpenGL.Queries
            }
        }
    }
-}
+}
--- a/Ryujinx.Graphics.OpenGL/Window.cs
+++ b/Ryujinx.Graphics.OpenGL/Window.cs
@@ -10,6 +10,8 @@ namespace Ryujinx.Graphics.OpenGL
        private const int TextureCount = 3;
        private readonly OpenGLRenderer _renderer;

+        private bool _initialized;
+
        private int _width;
        private int _height;
        private int _copyFramebufferHandle;
@@ -179,6 +181,7 @@ namespace Ryujinx.Graphics.OpenGL
        public void InitializeBackgroundContext(IOpenGLContext baseContext)
        {
            BackgroundContext = new BackgroundContextWorker(baseContext);
+            _initialized = true;
        }

        public void CaptureFrame(int x, int y, int width, int height, bool isBgra, bool flipX, bool flipY)
@@ -193,6 +196,11 @@ namespace Ryujinx.Graphics.OpenGL

        public void Dispose()
        {
+            if (!_initialized)
+            {
+                return;
+            }
+
            BackgroundContext.Dispose();

            if (_copyFramebufferHandle != 0)
@@ -203,4 +211,4 @@ namespace Ryujinx.Graphics.OpenGL
            }
        }
    }
-}
+}
--- a/Ryujinx.Graphics.Vulkan/VulkanRenderer.cs
+++ b/Ryujinx.Graphics.Vulkan/VulkanRenderer.cs
@@ -22,6 +22,8 @@ namespace Ryujinx.Graphics.Vulkan
        private Device _device;
        private WindowBase _window;

+        private bool _initialized;
+
        internal FormatCapabilities FormatCapabilities { get; private set; }
        internal HardwareCapabilities Capabilities;

@@ -266,6 +268,8 @@ namespace Ryujinx.Graphics.Vulkan
            LoadFeatures(supportedExtensions, maxQueueCount, queueFamilyIndex);

            _window = new Window(this, _surface, _physicalDevice, _device);
+
+            _initialized = true;
        }

        public BufferHandle CreateBuffer(int size)
@@ -573,6 +577,11 @@ namespace Ryujinx.Graphics.Vulkan

        public unsafe void Dispose()
        {
+            if (!_initialized)
+            {
+                return;
+            }
+
            CommandBufferPool.Dispose();
            BackgroundResources.Dispose();
            _counters.Dispose();
@@ -613,4 +622,4 @@ namespace Ryujinx.Graphics.Vulkan
            Api.DestroyInstance(_instance, null);
        }
    }
-}
+}
--- a/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardApplet.cs
+++ b/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardApplet.cs
@@ -1,4 +1,5 @@
-using Ryujinx.Common.Configuration.Hid;
+using Ryujinx.Common;
+using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Logging;
 using Ryujinx.HLE.HOS.Applets.SoftwareKeyboard;
 using Ryujinx.HLE.HOS.Services.Am.AppletAE;
@@ -9,6 +10,7 @@ using Ryujinx.Memory;
 using System;
 using System.Diagnostics;
 using System.IO;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Text;

@@ -78,13 +80,13 @@ namespace Ryujinx.HLE.HOS.Applets
                var launchParams   = _normalSession.Pop();
                var keyboardConfig = _normalSession.Pop();

-                _isBackground = keyboardConfig.Length == Marshal.SizeOf<SoftwareKeyboardInitialize>();
+                _isBackground = keyboardConfig.Length == Unsafe.SizeOf<SoftwareKeyboardInitialize>();

                if (_isBackground)
                {
                    // Initialize the keyboard applet in background mode.

-                    _keyboardBackgroundInitialize = ReadStruct<SoftwareKeyboardInitialize>(keyboardConfig);
+                    _keyboardBackgroundInitialize = MemoryMarshal.Read<SoftwareKeyboardInitialize>(keyboardConfig);
                    _backgroundState              = InlineKeyboardState.Uninitialized;

                    if (_device.UiHandler == null)
@@ -342,7 +344,7 @@ namespace Ryujinx.HLE.HOS.Applets
                        else
                        {
                            int wordsCount = reader.ReadInt32();
-                            int wordSize = Marshal.SizeOf<SoftwareKeyboardUserWord>();
+                            int wordSize = Unsafe.SizeOf<SoftwareKeyboardUserWord>();
                            remaining = stream.Length - stream.Position;

                            if (wordsCount > MaxUserWords)
@@ -359,8 +361,7 @@ namespace Ryujinx.HLE.HOS.Applets

                                for (int word = 0; word < wordsCount; word++)
                                {
-                                    byte[] wordData = reader.ReadBytes(wordSize);
-                                    _keyboardBackgroundUserWords[word] = ReadStruct<SoftwareKeyboardUserWord>(wordData);
+                                    _keyboardBackgroundUserWords[word] = reader.ReadStruct<SoftwareKeyboardUserWord>();
                                }
                            }
                        }
@@ -369,27 +370,25 @@ namespace Ryujinx.HLE.HOS.Applets
                    case InlineKeyboardRequest.SetCustomizeDic:
                        // Read the custom dic data.
                        remaining = stream.Length - stream.Position;
-                        if (remaining != Marshal.SizeOf<SoftwareKeyboardCustomizeDic>())
+                        if (remaining != Unsafe.SizeOf<SoftwareKeyboardCustomizeDic>())
                        {
                            Logger.Warning?.Print(LogClass.ServiceAm, $"Received invalid Software Keyboard Customize Dic of {remaining} bytes");
                        }
                        else
                        {
-                            var keyboardDicData = reader.ReadBytes((int)remaining);
-                            _keyboardBackgroundDic = ReadStruct<SoftwareKeyboardCustomizeDic>(keyboardDicData);
+                            _keyboardBackgroundDic = reader.ReadStruct<SoftwareKeyboardCustomizeDic>();
                        }
                        break;
                    case InlineKeyboardRequest.SetCustomizedDictionaries:
                        // Read the custom dictionaries data.
                        remaining = stream.Length - stream.Position;
-                        if (remaining != Marshal.SizeOf<SoftwareKeyboardDictSet>())
+                        if (remaining != Unsafe.SizeOf<SoftwareKeyboardDictSet>())
                        {
                            Logger.Warning?.Print(LogClass.ServiceAm, $"Received invalid Software Keyboard DictSet of {remaining} bytes");
                        }
                        else
                        {
-                            var keyboardDictData = reader.ReadBytes((int)remaining);
-                            _keyboardBackgroundDictSet = ReadStruct<SoftwareKeyboardDictSet>(keyboardDictData);
+                            _keyboardBackgroundDictSet = reader.ReadStruct<SoftwareKeyboardDictSet>();
                        }
                        break;
                    case InlineKeyboardRequest.Calc:
--- a/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardCustomizeDic.cs
+++ b/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardCustomizeDic.cs
@@ -5,10 +5,9 @@ namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard
    /// <summary>
    /// A structure used by SetCustomizeDic request to software keyboard.
    /// </summary>
-    [StructLayout(LayoutKind.Sequential, Pack = 4)]
+    [StructLayout(LayoutKind.Sequential, Size = 0x70)]
    struct SoftwareKeyboardCustomizeDic
    {
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 112)]
-        public byte[] Unknown;
+        // Unknown
    }
 }
--- a/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardDictSet.cs
+++ b/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardDictSet.cs
@@ -1,4 +1,5 @@
-using System.Runtime.InteropServices;
+using Ryujinx.Common.Memory;
+using System.Runtime.InteropServices;

 namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard
 {
@@ -21,8 +22,7 @@ namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard
        /// <summary>
        /// Array of word entries in the buffer.
        /// </summary>
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 24)]
-        public ulong[] Entries;
+        public Array24<ulong> Entries;

        /// <summary>
        /// Number of used entries in the Entries field.
--- a/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardUserWord.cs
+++ b/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardUserWord.cs
@@ -5,10 +5,9 @@ namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard
    /// <summary>
    /// A structure used by SetUserWordInfo request to the software keyboard.
    /// </summary>
-    [StructLayout(LayoutKind.Sequential, Pack = 4)]
+    [StructLayout(LayoutKind.Sequential, Size = 0x64)]
    struct SoftwareKeyboardUserWord
    {
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 100)]
-        public byte[] Unknown;
+        // Unknown
    }
 }
--- a/Ryujinx.HLE/HOS/Horizon.cs
+++ b/Ryujinx.HLE/HOS/Horizon.cs
@@ -479,7 +479,10 @@ namespace Ryujinx.HLE.HOS

                AudioRendererManager.Dispose();

-                LibHacHorizonManager.PmClient.Fs.UnregisterProgram(LibHacHorizonManager.ApplicationClient.Os.GetCurrentProcessId().Value).ThrowIfFailure();
+                if (LibHacHorizonManager.ApplicationClient != null)
+                {
+                    LibHacHorizonManager.PmClient.Fs.UnregisterProgram(LibHacHorizonManager.ApplicationClient.Os.GetCurrentProcessId().Value).ThrowIfFailure();
+                }

                KernelContext.Dispose();
            }
--- a/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/FriendService/Types/UserPresence.cs
+++ b/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/FriendService/Types/UserPresence.cs
@@ -1,9 +1,12 @@
-using Ryujinx.HLE.HOS.Services.Account.Acc;
+using Ryujinx.Common.Memory;
+using Ryujinx.HLE.HOS.Services.Account.Acc;
+using System;
 using System.Runtime.InteropServices;
+using System.Text;

 namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator.FriendService
 {
-    [StructLayout(LayoutKind.Sequential, Pack = 0x8, CharSet = CharSet.Ansi)]
+    [StructLayout(LayoutKind.Sequential, Pack = 0x8)]
    struct UserPresence
    {
        public UserId         UserId;
@@ -13,15 +16,20 @@ namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator.FriendService
        [MarshalAs(UnmanagedType.I1)]
        public bool SamePresenceGroupApplication;

-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x3)]
-        public char[] Unknown;
+        public Array3<byte> Unknown;
+        private AppKeyValueStorageHolder _appKeyValueStorage;

-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 0xC0)]
-        public char[] AppKeyValueStorage;
+        public Span<byte> AppKeyValueStorage => MemoryMarshal.Cast<AppKeyValueStorageHolder, byte>(MemoryMarshal.CreateSpan(ref _appKeyValueStorage, AppKeyValueStorageHolder.Size));
+
+        [StructLayout(LayoutKind.Sequential, Pack = 0x1, Size = Size)]
+        private struct AppKeyValueStorageHolder
+        {
+            public const int Size = 0xC0;
+        }

        public override string ToString()
        {
-            return $"UserPresence {{ UserId: {UserId}, LastTimeOnlineTimestamp: {LastTimeOnlineTimestamp}, Status: {Status}, AppKeyValueStorage: {AppKeyValueStorage} }}";
+            return $"UserPresence {{ UserId: {UserId}, LastTimeOnlineTimestamp: {LastTimeOnlineTimestamp}, Status: {Status}, AppKeyValueStorage: {Encoding.ASCII.GetString(AppKeyValueStorage)} }}";
        }
    }
 }
--- a/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/IFriendService.cs
+++ b/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/IFriendService.cs
@@ -236,23 +236,14 @@ namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator
            ulong position = context.Request.PtrBuff[0].Position;
            ulong size     = context.Request.PtrBuff[0].Size;

-            byte[] bufferContent = new byte[size];
-
-            context.Memory.Read(position, bufferContent);
+            ReadOnlySpan<UserPresence> userPresenceInputArray = MemoryMarshal.Cast<byte, UserPresence>(context.Memory.GetSpan(position, (int)size));

            if (uuid.IsNull)
            {
                return ResultCode.InvalidArgument;
            }

-            int elementCount = bufferContent.Length / Marshal.SizeOf<UserPresence>();
-
-            using (BinaryReader bufferReader = new BinaryReader(new MemoryStream(bufferContent)))
-            {
-                UserPresence[] userPresenceInputArray = bufferReader.ReadStructArray<UserPresence>(elementCount);
-
-                Logger.Stub?.PrintStub(LogClass.ServiceFriend, new { UserId = uuid.ToString(), userPresenceInputArray });
-            }
+            Logger.Stub?.PrintStub(LogClass.ServiceFriend, new { UserId = uuid.ToString(), userPresenceInputArray = userPresenceInputArray.ToArray() });

            return ResultCode.Success;
        }
--- a/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/NotificationService/Types/NotificationInfo.cs
+++ b/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/NotificationService/Types/NotificationInfo.cs
@@ -1,15 +1,13 @@
-using System.Runtime.InteropServices;
+using Ryujinx.Common.Memory;
+using System.Runtime.InteropServices;

 namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator.NotificationService
 {
-    [StructLayout(LayoutKind.Sequential, Pack = 0x8, Size = 0x10)]
+    [StructLayout(LayoutKind.Sequential, Size = 0x10)]
    struct NotificationInfo
    {
        public NotificationEventType Type;
-
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x4)]
-        public char[] Padding;
-
+        private Array4<byte> _padding;
        public long NetworkUserIdPlaceholder;
    }
 }
--- a/Ryujinx.HLE/HOS/Services/Sdb/Pdm/QueryService/QueryPlayStatisticsManager.cs
+++ b/Ryujinx.HLE/HOS/Services/Sdb/Pdm/QueryService/QueryPlayStatisticsManager.cs
@@ -5,6 +5,7 @@ using Ryujinx.HLE.HOS.Services.Sdb.Pdm.QueryService.Types;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

 namespace Ryujinx.HLE.HOS.Services.Sdb.Pdm.QueryService
@@ -75,7 +76,7 @@ namespace Ryujinx.HLE.HOS.Services.Sdb.Pdm.QueryService

            for (int i = 0; i < filteredApplicationPlayStatistics.Count(); i++)
            {
-                MemoryHelper.Write(context.Memory, outputPosition + (ulong)(i * Marshal.SizeOf<ApplicationPlayStatistics>()), filteredApplicationPlayStatistics.ElementAt(i).Value);
+                MemoryHelper.Write(context.Memory, outputPosition + (ulong)(i * Unsafe.SizeOf<ApplicationPlayStatistics>()), filteredApplicationPlayStatistics.ElementAt(i).Value);
            }

            context.ResponseData.Write(filteredApplicationPlayStatistics.Count());
--- a/Ryujinx.HLE/HOS/Services/Time/Clock/Types/ClockSnapshot.cs
+++ b/Ryujinx.HLE/HOS/Services/Time/Clock/Types/ClockSnapshot.cs
@@ -1,4 +1,5 @@
 using Ryujinx.HLE.HOS.Services.Time.TimeZone;
+using System;
 using System.Runtime.InteropServices;

 namespace Ryujinx.HLE.HOS.Services.Time.Clock
@@ -16,14 +17,22 @@ namespace Ryujinx.HLE.HOS.Services.Time.Clock
        public CalendarAdditionalInfo NetworkCalendarAdditionalTime;
        public SteadyClockTimePoint   SteadyClockTimePoint;

-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x24)]
-        public char[] LocationName;
+        private LocationNameStorageHolder _locationName;
+
+        public Span<byte> LocationName => MemoryMarshal.Cast<LocationNameStorageHolder, byte>(MemoryMarshal.CreateSpan(ref _locationName, LocationNameStorageHolder.Size));

        [MarshalAs(UnmanagedType.I1)]
        public bool   IsAutomaticCorrectionEnabled;
        public byte   Type;
        public ushort Unknown;

+
+        [StructLayout(LayoutKind.Sequential, Pack = 1, Size = Size)]
+        private struct LocationNameStorageHolder
+        {
+            public const int Size = 0x24;
+        }
+
        public static ResultCode GetCurrentTime(out long currentTime, SteadyClockTimePoint steadyClockTimePoint, SystemClockContext context)
        {
            currentTime = 0;
--- a/Ryujinx.HLE/HOS/Services/Time/IStaticServiceForPsc.cs
+++ b/Ryujinx.HLE/HOS/Services/Time/IStaticServiceForPsc.cs
@@ -8,7 +8,9 @@ using Ryujinx.HLE.HOS.Services.Time.TimeZone;
 using System;
 using System.Diagnostics;
 using System.IO;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Text;

 namespace Ryujinx.HLE.HOS.Services.Time
 {
@@ -281,7 +283,7 @@ namespace Ryujinx.HLE.HOS.Services.Time
        {
            byte type = context.RequestData.ReadByte();

-            context.Response.PtrBuff[0] = context.Response.PtrBuff[0].WithSize((uint)Marshal.SizeOf<ClockSnapshot>());
+            context.Response.PtrBuff[0] = context.Response.PtrBuff[0].WithSize((uint)Unsafe.SizeOf<ClockSnapshot>());

            context.RequestData.BaseStream.Position += 7;

@@ -372,12 +374,9 @@ namespace Ryujinx.HLE.HOS.Services.Time
                return result;
            }

-            char[] tzName       = deviceLocationName.ToCharArray();
-            char[] locationName = new char[0x24];
+            ReadOnlySpan<byte> tzName = Encoding.ASCII.GetBytes(deviceLocationName);

-            Array.Copy(tzName, locationName, tzName.Length);
-
-            clockSnapshot.LocationName = locationName;
+            tzName.CopyTo(clockSnapshot.LocationName);

            result = ClockSnapshot.GetCurrentTime(out clockSnapshot.UserTime, currentTimePoint, clockSnapshot.UserContext);

@@ -414,7 +413,7 @@ namespace Ryujinx.HLE.HOS.Services.Time

        private ClockSnapshot ReadClockSnapshotFromBuffer(ServiceCtx context, IpcPtrBuffDesc ipcDesc)
        {
-            Debug.Assert(ipcDesc.Size == (ulong)Marshal.SizeOf<ClockSnapshot>());
+            Debug.Assert(ipcDesc.Size == (ulong)Unsafe.SizeOf<ClockSnapshot>());

            byte[] temp = new byte[ipcDesc.Size];

--- a/Ryujinx.HLE/HOS/Services/Time/TimeZone/TimeZone.cs
+++ b/Ryujinx.HLE/HOS/Services/Time/TimeZone/TimeZone.cs
@@ -5,6 +5,7 @@ using Ryujinx.HLE.Utilities;
 using System;
 using System.Buffers.Binary;
 using System.IO;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Text;

@@ -890,14 +891,14 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone

            long streamLength = reader.BaseStream.Length;

-            if (streamLength < Marshal.SizeOf<TzifHeader>())
+            if (streamLength < Unsafe.SizeOf<TzifHeader>())
            {
                return false;
            }

            TzifHeader header = reader.ReadStruct<TzifHeader>();

-            streamLength -= Marshal.SizeOf<TzifHeader>();
+            streamLength -= Unsafe.SizeOf<TzifHeader>();

            int ttisGMTCount = Detzcode32(header.TtisGMTCount);
            int ttisSTDCount = Detzcode32(header.TtisSTDCount);
--- a/Ryujinx.Headless.SDL2/Vulkan/VulkanWindow.cs
+++ b/Ryujinx.Headless.SDL2/Vulkan/VulkanWindow.cs
@@ -40,20 +40,16 @@ namespace Ryujinx.Headless.SDL2.Vulkan
            return (IntPtr)surfaceHandle;
        }

-        // TODO: Fix this in SDL2-CS.
-        [DllImport("SDL2", EntryPoint = "SDL_Vulkan_GetInstanceExtensions", CallingConvention = CallingConvention.Cdecl)]
-        public static extern SDL_bool SDL_Vulkan_GetInstanceExtensions_Workaround(IntPtr window, out uint count, IntPtr names);
-
        public unsafe string[] GetRequiredInstanceExtensions()
        {
-            if (SDL_Vulkan_GetInstanceExtensions_Workaround(WindowHandle, out uint extensionsCount, IntPtr.Zero) == SDL_bool.SDL_TRUE)
+            if (SDL_Vulkan_GetInstanceExtensions(WindowHandle, out uint extensionsCount, IntPtr.Zero) == SDL_bool.SDL_TRUE)
            {
                IntPtr[] rawExtensions = new IntPtr[(int)extensionsCount];
                string[] extensions = new string[(int)extensionsCount];

                fixed (IntPtr* rawExtensionsPtr = rawExtensions)
                {
-                    if (SDL_Vulkan_GetInstanceExtensions_Workaround(WindowHandle, out extensionsCount, (IntPtr)rawExtensionsPtr) == SDL_bool.SDL_TRUE)
+                    if (SDL_Vulkan_GetInstanceExtensions(WindowHandle, out extensionsCount, (IntPtr)rawExtensionsPtr) == SDL_bool.SDL_TRUE)
                    {
                        for (int i = 0; i < extensions.Length; i++)
                        {
--- a/Ryujinx.Input/Motion/CemuHook/Protocol/ControllerData.cs
+++ b/Ryujinx.Input/Motion/CemuHook/Protocol/ControllerData.cs
@@ -1,16 +1,15 @@
-using System.Runtime.InteropServices;
+using Ryujinx.Common.Memory;
+using System.Runtime.InteropServices;

 namespace Ryujinx.Input.Motion.CemuHook.Protocol
 {
    [StructLayout(LayoutKind.Sequential, Pack = 1)]
    struct ControllerDataRequest
    {
-        public MessageType    Type;
+        public MessageType Type;
        public SubscriberType SubscriberType;
-        public byte           Slot;
-
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)]
-        public byte[] MacAddress;
+        public byte Slot;
+        public Array6<byte> MacAddress;
    }

    [StructLayout(LayoutKind.Sequential, Pack = 1)]
@@ -27,11 +26,8 @@ namespace Ryujinx.Input.Motion.CemuHook.Protocol
        public uint           DPadAnalog;
        public ulong          MainButtonsAnalog;

-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)]
-        public byte[] Touch1;
-
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)]
-        public byte[] Touch2;
+        public Array6<byte> Touch1;
+        public Array6<byte> Touch2;

        public ulong MotionTimestamp;
        public float AccelerometerX;
--- a/Ryujinx.Input/Motion/CemuHook/Protocol/ControllerInfo.cs
+++ b/Ryujinx.Input/Motion/CemuHook/Protocol/ControllerInfo.cs
@@ -1,21 +1,20 @@
-using System.Runtime.InteropServices;
+using Ryujinx.Common.Memory;
+using System.Runtime.InteropServices;

 namespace Ryujinx.Input.Motion.CemuHook.Protocol
 {
    [StructLayout(LayoutKind.Sequential, Pack = 1)]
    public struct ControllerInfoResponse
    {
-        public  SharedResponse Shared;
-        private byte           _zero;
+        public SharedResponse Shared;
+        private byte _zero;
    }

    [StructLayout(LayoutKind.Sequential, Pack = 1)]
    public struct ControllerInfoRequest
    {
        public MessageType Type;
-        public int         PortsCount;
-
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-        public byte[] PortIndices;
+        public int PortsCount;
+        public Array4<byte> PortIndices;
    }
 }
--- a/Ryujinx.Input/Motion/CemuHook/Protocol/SharedResponse.cs
+++ b/Ryujinx.Input/Motion/CemuHook/Protocol/SharedResponse.cs
@@ -1,4 +1,5 @@
-using System.Runtime.InteropServices;
+using Ryujinx.Common.Memory;
+using System.Runtime.InteropServices;

 namespace Ryujinx.Input.Motion.CemuHook.Protocol
 {
@@ -11,8 +12,7 @@ namespace Ryujinx.Input.Motion.CemuHook.Protocol
        public DeviceModelType ModelType;
        public ConnectionType  ConnectionType;

-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)]
-        public byte[]        MacAddress;
+        public Array6<byte> MacAddress;
        public BatteryStatus BatteryStatus;
    }

--- a/Ryujinx.Memory.Tests/MockVirtualMemoryManager.cs
+++ b/Ryujinx.Memory.Tests/MockVirtualMemoryManager.cs
@@ -44,6 +44,11 @@ namespace Ryujinx.Memory.Tests
            throw new NotImplementedException();
        }

+        public bool WriteWithRedundancyCheck(ulong va, ReadOnlySpan<byte> data)
+        {
+            throw new NotImplementedException();
+        }
+
        public ReadOnlySpan<byte> GetSpan(ulong va, int size, bool tracked = false)
        {
            throw new NotImplementedException();
--- a/Ryujinx.Memory/AddressSpaceManager.cs
+++ b/Ryujinx.Memory/AddressSpaceManager.cs
@@ -136,6 +136,14 @@ namespace Ryujinx.Memory
            }
        }

+        /// <inheritdoc/>
+        public bool WriteWithRedundancyCheck(ulong va, ReadOnlySpan<byte> data)
+        {
+            Write(va, data);
+
+            return true;
+        }
+
        /// <inheritdoc/>
        public ReadOnlySpan<byte> GetSpan(ulong va, int size, bool tracked = false)
        {
--- a/Ryujinx.Memory/IVirtualMemoryManager.cs
+++ b/Ryujinx.Memory/IVirtualMemoryManager.cs
@@ -58,6 +58,17 @@ namespace Ryujinx.Memory
        /// <exception cref="InvalidMemoryRegionException">Throw for unhandled invalid or unmapped memory accesses</exception>
        void Write(ulong va, ReadOnlySpan<byte> data);

+        /// <summary>
+        /// Writes data to the application process, returning false if the data was not changed.
+        /// This triggers read memory tracking, as a redundancy check would be useless if the data is not up to date.
+        /// </summary>
+        /// <remarks>The memory manager can return that memory has changed when it hasn't to avoid expensive data copies.</remarks>
+        /// <param name="va">Virtual address to write the data into</param>
+        /// <param name="data">Data to be written</param>
+        /// <exception cref="InvalidMemoryRegionException">Throw for unhandled invalid or unmapped memory accesses</exception>
+        /// <returns>True if the data was changed, false otherwise</returns>
+        bool WriteWithRedundancyCheck(ulong va, ReadOnlySpan<byte> data);
+
        void Fill(ulong va, ulong size, byte value)
        {
            const int MaxChunkSize = 1 << 24;
--- a/Ryujinx.SDL2.Common/Ryujinx.SDL2.Common.csproj
+++ b/Ryujinx.SDL2.Common/Ryujinx.SDL2.Common.csproj
@@ -5,7 +5,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Ryujinx.SDL2-CS" Version="2.0.22-build20" />
+    <PackageReference Include="Ryujinx.SDL2-CS" Version="2.24.2-build21" />
  </ItemGroup>

  <ItemGroup>
--- a/Ryujinx.SDL2.Common/SDL2Driver.cs
+++ b/Ryujinx.SDL2.Common/SDL2Driver.cs
@@ -43,6 +43,8 @@ namespace Ryujinx.SDL2.Common

        private SDL2Driver() {}

+        private const string SDL_HINT_JOYSTICK_HIDAPI_COMBINE_JOY_CONS = "SDL_JOYSTICK_HIDAPI_COMBINE_JOY_CONS";
+
        public void Initialize()
        {
            lock (_lock)
@@ -60,6 +62,11 @@ namespace Ryujinx.SDL2.Common
                SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_SWITCH_HOME_LED, "0");
                SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_JOY_CONS, "1");

+
+                // NOTE: As of SDL2 2.24.0, joycons are combined by default but the motion source only come from one of them.
+                // We disable this behavior for now.
+                SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_COMBINE_JOY_CONS, "0");
+
                if (SDL_Init(SdlInitFlags) != 0)
                {
                    string errorMessage = $"SDL2 initlaization failed with error \"{SDL_GetError()}\"";
--- a/Ryujinx/Ryujinx.csproj
+++ b/Ryujinx/Ryujinx.csproj
@@ -26,7 +26,7 @@
    <PackageReference Include="Ryujinx.Audio.OpenAL.Dependencies" Version="1.21.0.1" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'osx-x64'" />
    <PackageReference Include="OpenTK.Graphics" Version="4.7.2" />
    <PackageReference Include="SPB" Version="0.0.4-build28" />
-    <PackageReference Include="SharpZipLib" Version="1.3.3" />
+    <PackageReference Include="SharpZipLib" Version="1.4.1" />
    <PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" />
  </ItemGroup>

--- a/Ryujinx/Ui/MainWindow.cs
+++ b/Ryujinx/Ui/MainWindow.cs
@@ -735,7 +735,6 @@ namespace Ryujinx.Ui

                                _emulationContext.Dispose();
                                SwitchToGameTable();
-                                RendererWidget.Dispose();

                                return;
                            }
@@ -747,7 +746,6 @@ namespace Ryujinx.Ui

                            _emulationContext.Dispose();
                            SwitchToGameTable();
-                            RendererWidget.Dispose();

                            return;
                        }
@@ -770,7 +768,6 @@ namespace Ryujinx.Ui

                        _emulationContext.Dispose();
                        SwitchToGameTable();
-                        RendererWidget.Dispose();

                        return;
                    }
--- a/Ryujinx/Ui/RendererWidgetBase.cs
+++ b/Ryujinx/Ui/RendererWidgetBase.cs
@@ -519,10 +519,14 @@ namespace Ryujinx.Ui
            _gpuCancellationTokenSource.Cancel();

            _isStopped = true;
-            _isActive = false;
+            
+            if (_isActive)
+            {
+                _isActive = false;

-            _exitEvent.WaitOne();
-            _exitEvent.Dispose();
+                _exitEvent.WaitOne();
+                _exitEvent.Dispose();
+            }
        }

        private void NVStutterWorkaround()
--- a/Ryujinx/Ui/VKRenderer.cs
+++ b/Ryujinx/Ui/VKRenderer.cs
@@ -72,7 +72,8 @@ namespace Ryujinx.Ui

        protected override void Dispose(bool disposing)
        {
-            Device.DisposeGpu();
+            Device?.DisposeGpu();
+
            NpadManager.Dispose();
        }
    }
Author	SHA1	Message	Date
Ac_K	3fbacd0f49	ava: Rework DLC Manager, Add various fixes and cleanup (#3896 ) * Fixes Everything Part.2 * Change sorting, fix remove and heading	2022-11-25 12:41:34 +01:00
dependabot[bot]	7aa6abc120	nuget: bump SharpZipLib from 1.3.3 to 1.4.1 (#3893 ) Bumps [SharpZipLib](https://github.com/icsharpcode/SharpZipLib) from 1.3.3 to 1.4.1. - [Release notes](https://github.com/icsharpcode/SharpZipLib/releases) - [Changelog](https://github.com/icsharpcode/SharpZipLib/blob/master/docs/Changes.txt) - [Commits](https://github.com/icsharpcode/SharpZipLib/compare/v1.3.3...v1.4.1) --- updated-dependencies: - dependency-name: SharpZipLib dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-11-24 20:30:17 +01:00
Mary-nyan	548bfd60a2	chore: Update Ryujinx.SDL2-CS to 2.24.2 (#3892 ) * chore: Update Ryujinx.SDL2-CS to 2.24.2 * Disable SDL_HINT_JOYSTICK_HIDAPI_COMBINE_JOY_CONS	2022-11-24 20:13:16 +01:00
riperiperi	65778a6b78	GPU: Don't trigger uploads for redundant buffer updates (#3828 ) * Initial implementation * Actually do The Thing * Add remark about performance to IVirtualMemoryManager	2022-11-24 15:50:15 +01:00
Mary-nyan	f4e879a1e6	Reduce usage of Marshal.PtrToStructure and Marshal.StructureToPtr (#3805 ) * common: Make BinaryReaderExtensions Read & Write take unamanged types This allows us to not rely on Marshal.PtrToStructure and Marshal.StructureToPtr for those. * common: Make MemoryHelper Read & Write takes unamanged types * Update Marshal.SizeOf => Unsafe.SizeOf when appropriate and start moving software applet to unmanaged types	2022-11-24 15:26:29 +01:00
Ac_K	a1ddaa2736	ui: Fixes disposing on GTK/Avalonia and Firmware Messages on Avalonia (#3885 ) * ui: Only wait on _exitEvent when MainLoop is active under GTK This fixes a dispose issue under Horizon/GTK, we don't check if the ApplicationClient is null so it throw NCE. We don't check if the main loop is active and waiting an event which is set in the main loop... So that could lead to a freeze. Everything works fine in GTK now. Related issue: https://github.com/Ryujinx/Ryujinx/issues/3873 As a side note, same kind of issue appear in Avalonia UI too. Firmware's popup doesn't show anything and the emulator just freeze. * TSRBerry's change Co-authored-by: TSRBerry <20988865+TSRBerry@users.noreply.github.com> * Fix Avalonia crashing/freezing * Add Avalonia OpenGL fixes * Fix firmware popup on windows * Fixes everything * Add _initialized bool to VulkanRenderer and OpenGL Window Co-authored-by: TSRBerry <20988865+TSRBerry@users.noreply.github.com>	2022-11-24 15:08:27 +01:00
Mary-nyan	008286b79f	Ryujinx.Ava: Add missing redefinition of app name (#3890 ) Before this, Ryujinx would possibly report as "Avalonia Application".	2022-11-24 14:52:39 +01:00
gdkchan	a0c77f8d11	Fix NRE on Avalonia for error applets with unknown error message (#3888 )	2022-11-24 09:31:00 +01:00