UI: Updater: Add support for eventual Windows on ARM updates

SSBU DRPC - Stage Editing (#707 )
Adds it so the Rich Presence now notices when the player edits a custom stage!
2025-02-25 17:34:56 -06:00 · 2025-02-25 15:48:35 -06:00 · 2025-02-25 15:34:21 -06:00
16 changed files with 154 additions and 453 deletions
--- a/src/ARMeilleure/Translation/Cache/JitCache.cs
+++ b/src/ARMeilleure/Translation/Cache/JitCache.cs
@@ -24,7 +24,7 @@ namespace ARMeilleure.Translation.Cache

        private static JitCacheInvalidation _jitCacheInvalidator;

-        private static CacheMemoryAllocator _cacheAllocator;
+        private static List<CacheMemoryAllocator> _cacheAllocators = [];

        private static readonly List<CacheEntry> _cacheEntries = [];

@@ -40,37 +40,48 @@ namespace ARMeilleure.Translation.Cache

        public static void Initialize(IJitMemoryAllocator allocator)
        {
-            if (_initialized)
-            {
-                return;
-            }
-
            lock (_lock)
            {
                if (_initialized)
                {
-                    return;
+                    if (OperatingSystem.IsWindows())
+                    {
+                        JitUnwindWindows.RemoveFunctionTableHandler(
+                            _jitRegions[0].Pointer);
+                    }
+
+                    for (int i = 0; i < _jitRegions.Count; i++)
+                    {
+                        _jitRegions[i].Dispose();
+                    }
+
+                    _jitRegions.Clear();
+                    _cacheAllocators.Clear();
                }
+                else
+                {
+                    _initialized = true;
+                }
+
+                _activeRegionIndex = 0;

                ReservedRegion firstRegion = new(allocator, CacheSize);
                _jitRegions.Add(firstRegion);
-                _activeRegionIndex = 0;
+
+                CacheMemoryAllocator firstCacheAllocator = new(CacheSize);
+                _cacheAllocators.Add(firstCacheAllocator);

                if (!OperatingSystem.IsWindows() && !OperatingSystem.IsMacOS())
                {
                    _jitCacheInvalidator = new JitCacheInvalidation(allocator);
                }

-                _cacheAllocator = new CacheMemoryAllocator(CacheSize);
-
                if (OperatingSystem.IsWindows())
                {
                    JitUnwindWindows.InstallFunctionTableHandler(
                        firstRegion.Pointer, CacheSize, firstRegion.Pointer + Allocate(_pageSize)
                    );
                }
-
-                _initialized = true;
            }
        }

@@ -136,7 +147,7 @@ namespace ARMeilleure.Translation.Cache

                    if (TryFind(funcOffset, out CacheEntry entry, out int entryIndex) && entry.Offset == funcOffset)
                    {
-                        _cacheAllocator.Free(funcOffset, AlignCodeSize(entry.Size));
+                        _cacheAllocators[_activeRegionIndex].Free(funcOffset, AlignCodeSize(entry.Size));
                        _cacheEntries.RemoveAt(entryIndex);
                    }

@@ -167,30 +178,24 @@ namespace ARMeilleure.Translation.Cache
        {
            codeSize = AlignCodeSize(codeSize);

-            for (int i = _activeRegionIndex; i < _jitRegions.Count; i++)
+            int allocOffset = _cacheAllocators[_activeRegionIndex].Allocate(codeSize);
+
+            if (allocOffset >= 0)
            {
-                int allocOffset = _cacheAllocator.Allocate(codeSize);
-        
-                if (allocOffset >= 0)
-                {
-                    _jitRegions[i].ExpandIfNeeded((ulong)allocOffset + (ulong)codeSize);
-                    _activeRegionIndex = i;
-                    return allocOffset;
-                }
+                _jitRegions[_activeRegionIndex].ExpandIfNeeded((ulong)allocOffset + (ulong)codeSize);
+                return allocOffset;
            }

            int exhaustedRegion = _activeRegionIndex;
            ReservedRegion newRegion = new(_jitRegions[0].Allocator, CacheSize);
            _jitRegions.Add(newRegion);
            _activeRegionIndex = _jitRegions.Count - 1;
-            
-            int newRegionNumber = _activeRegionIndex;

-            Logger.Warning?.Print(LogClass.Cpu, $"JIT Cache Region {exhaustedRegion} exhausted, creating new Cache Region {newRegionNumber} ({((long)(newRegionNumber + 1) * CacheSize).Bytes()} Total Allocation).");
-        
-            _cacheAllocator = new CacheMemoryAllocator(CacheSize);
+            Logger.Warning?.Print(LogClass.Cpu, $"JIT Cache Region {exhaustedRegion} exhausted, creating new Cache Region {_activeRegionIndex} ({((long)(_activeRegionIndex + 1) * CacheSize).Bytes()} Total Allocation).");

-            int allocOffsetNew = _cacheAllocator.Allocate(codeSize);
+            _cacheAllocators.Add(new CacheMemoryAllocator(CacheSize));
+
+            int allocOffsetNew = _cacheAllocators[_activeRegionIndex].Allocate(codeSize);
            if (allocOffsetNew < 0)
            {
                throw new OutOfMemoryException("Failed to allocate in new Cache Region!");
--- a/src/ARMeilleure/Translation/Cache/JitUnwindWindows.cs
+++ b/src/ARMeilleure/Translation/Cache/JitUnwindWindows.cs
@@ -52,6 +52,11 @@ namespace ARMeilleure.Translation.Cache
            nint context,
            [MarshalAs(UnmanagedType.LPWStr)] string outOfProcessCallbackDll);

+        [LibraryImport("kernel32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static unsafe partial bool RtlDeleteFunctionTable(
+            ulong tableIdentifier);
+
        private static GetRuntimeFunctionCallback _getRuntimeFunctionCallback;

        private static int _sizeOfRuntimeFunction;
@@ -91,6 +96,23 @@ namespace ARMeilleure.Translation.Cache
            }
        }

+        public static void RemoveFunctionTableHandler(nint codeCachePointer)
+        {
+            ulong codeCachePtr = (ulong)codeCachePointer.ToInt64();
+
+            bool result;
+
+            unsafe
+            {
+                result = RtlDeleteFunctionTable(codeCachePtr | 3);
+            }
+
+            if (!result)
+            {
+                throw new InvalidOperationException("Failure removing function table callback.");
+            }
+        }
+
        private static unsafe RuntimeFunction* FunctionTableHandler(ulong controlPc, nint context)
        {
            int offset = (int)((long)controlPc - context.ToInt64());
--- a/src/Ryujinx.Common/Helpers/RunningPlatform.cs
+++ b/src/Ryujinx.Common/Helpers/RunningPlatform.cs
@@ -5,15 +5,34 @@ using System.Runtime.InteropServices;

 namespace Ryujinx.Common.Helper
 {
+    public enum OperatingSystemType
+    {
+        MacOS,
+        Linux,
+        Windows   
+    }
+    
    public static class RunningPlatform
    {
+        public static readonly OperatingSystemType CurrentOS 
+            = IsMacOS 
+                ? OperatingSystemType.MacOS 
+                : IsWindows
+                    ? OperatingSystemType.Windows
+                    : IsLinux
+                        ? OperatingSystemType.Linux
+                        : throw new PlatformNotSupportedException();
+
+        public static Architecture Architecture => RuntimeInformation.OSArchitecture;
+        public static Architecture CurrentProcessArchitecture => RuntimeInformation.ProcessArchitecture;
+        
        public static bool IsMacOS => OperatingSystem.IsMacOS();
        public static bool IsWindows => OperatingSystem.IsWindows();
        public static bool IsLinux => OperatingSystem.IsLinux();
        
-        public static bool IsArm => RuntimeInformation.OSArchitecture is Architecture.Arm64;
+        public static bool IsArm => Architecture is Architecture.Arm64;
        
-        public static bool IsX64 => RuntimeInformation.OSArchitecture is Architecture.X64;
+        public static bool IsX64 => Architecture is Architecture.X64;

        public static bool IsIntelMac => IsMacOS && IsX64;
        public static bool IsArmMac => IsMacOS && IsArm;
--- a/src/Ryujinx/Assets/Styles/Styles.xaml
+++ b/src/Ryujinx/Assets/Styles/Styles.xaml
@@ -1,8 +1,8 @@
-<Styles
+<Styles
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
-    xmlns:windowing="clr-namespace:FluentAvalonia.UI.Windowing;assembly=FluentAvalonia">   
+    xmlns:windowing="clr-namespace:FluentAvalonia.UI.Windowing;assembly=FluentAvalonia">
    <Design.PreviewWith>
        <Border Height="2000"
                Padding="20">
@@ -41,7 +41,7 @@
                    </StackPanel>
                </Grid>
                <ui:NumberBox Value="1" />
-                </StackPanel>
+            </StackPanel>
        </Border>
    </Design.PreviewWith>
    <Style Selector="DropDownButton">
@@ -331,15 +331,6 @@
        <Setter Property="Margin"
                Value="0,5,0,0" />
    </Style>
-    <Style Selector="TextBlock.pending" >
-        <Setter Property="Foreground" Value="SlateGray"/>
-        <Setter Property="VerticalAlignment" Value="Center"/>
-        <Setter Property="HorizontalAlignment" Value="Left"/>
-        <Setter Property="FontSize" Value="12"/>
-        <Setter Property="Text" Value="(pending!)"/>
-    </Style>
-    <Style Selector="StackPanel.globalConfigMarker">
-    </Style>
    <Style Selector="ContextMenu">
        <Setter Property="BorderBrush"
                Value="{DynamicResource MenuFlyoutPresenterBorderBrush}" />
--- a/src/Ryujinx/Assets/locales.json
+++ b/src/Ryujinx/Assets/locales.json
@@ -7072,81 +7072,6 @@
        "zh_TW": "新增"
      }
    },
-    {
-      "ID": "ControllerSettingsModifiedNotification",
-      "Translations": {
-        "ar_SA": "(تم التعديل!)",
-        "de_DE": "(modifiziert!)",
-        "el_GR": "(τροποποιημένο!)",
-        "en_US": "(Modified!)",
-        "es_ES": "(modificado!)",
-        "fr_FR": "(modifié!)",
-        "he_IL": "(שונה!)",
-        "it_IT": "(modificato!)",
-        "ja_JP": "(変更済み!)",
-        "ko_KR": "(수정됨!)",
-        "no_NO": "(modifisert!)",
-        "pl_PL": "(zmodyfikowane!)",
-        "pt_BR": "(modificado!)",
-        "ru_RU": "(изменено!)",
-        "sv_SE": "(ändrad!)",
-        "th_TH": "(แก้ไขแล้ว!)",
-        "tr_TR": "(değiştirildi!)",
-        "uk_UA": "(модифіковано!)",
-        "zh_CN": "(已修改!)",
-        "zh_TW": "(已修改!)"
-      }
-    },
-    {
-      "ID": "ControllerSettingsDisableDeviceForSaving",
-      "Translations": {
-        "ar_SA": "تم إعداد التحكم.\n\nفي انتظار اتصال وحدة التحكم...",
-        "de_DE": "Steuerung konfiguriert.\n\nWarten auf die Verbindung des Controllers...",
-        "el_GR": "Η διαχείριση έχει ρυθμιστεί.\n\nΑναμένεται σύνδεση του χειριστηρίου...",
-        "en_US": "Control configured.\n\nWaiting for controller connection...",
-        "es_ES": "Control configurado.\n\nEsperando la conexión del controlador...",
-        "fr_FR": "Contrôle configuré.\n\nEn attente de la connexion du contrôleur...",
-        "he_IL": "השליטה הוגדרה.\n\nממתין לחיבור הבקר...",
-        "it_IT": "Controllo configurato.\n\nIn attesa della connessione del controller...",
-        "ja_JP": "コントロールが設定されました。\n\nコントローラーの接続を待っています...",
-        "ko_KR": "제어가 설정되었습니다.\n\n컨트롤러 연결 대기 중...",
-        "no_NO": "Kontroll konfigurert.\n\nVenter på tilkobling av kontroller...",
-        "pl_PL": "Sterowanie skonfigurowane.\n\nOczekiwanie na połączenie kontrolera...",
-        "pt_BR": "Controle configurado.\n\nAguardando conexão do controle...",
-        "ru_RU": "Управление настроено.\n\nОжидается подключение контроллера...",
-        "sv_SE": "Kontroll konfigurerad.\n\nVäntar på anslutning av kontrollen...",
-        "th_TH": "การควบคุมได้รับการตั้งค่าแล้ว\n\nกำลังรอการเชื่อมต่อคอนโทรลเลอร์...",
-        "tr_TR": "Kontrol yapılandırıldı.\n\nKontrolcü bağlantısı bekleniyor...",
-        "uk_UA": "Керування налаштовано.\n\nОчікується підключення контролера...",
-        "zh_CN": "控制已配置。\n\n等待控制器连接...",
-        "zh_TW": "控制已設定。\n\n等待控制器連接..."
-      }
-    },
-    {
-      "ID": "ControllerSettingsUnlink",
-      "Translations": {
-        "ar_SA": "إلغاء الربط",
-        "de_DE": "Entkoppeln",
-        "el_GR": "Αποσύνδεση",
-        "en_US": "Unlink",
-        "es_ES": "Desvincular",
-        "fr_FR": "Dissocier",
-        "he_IL": "ניתוק קישור",
-        "it_IT": "Scollega",
-        "ja_JP": "リンク解除",
-        "ko_KR": "연결 해제",
-        "no_NO": "Frakoble",
-        "pl_PL": "Odłącz",
-        "pt_BR": "Desvincular",
-        "ru_RU": "Отвязать",
-        "sv_SE": "Koppla från",
-        "th_TH": "ยกเลิกการเชื่อมโยง",
-        "tr_TR": "Bağlantıyı Kes",
-        "uk_UA": "Відв'язати",
-        "zh_CN": "解除绑定",
-        "zh_TW": "解除綁定"
-      }
-    },
    {
      "ID": "ControllerSettingsRemove",
      "Translations": {
@@ -11797,31 +11722,6 @@
        "zh_TW": "儲存設定檔"
      }
    },
-    {
-      "ID": "ControllerSettingsCancelCurrentChangesToolTip",
-      "Translations": {
-        "ar_SA": "إلغاء التغييرات الحالية",
-        "de_DE": "Aktuelle Änderungen abbrechen",
-        "el_GR": "Ακύρωση τρεχουσών αλλαγών",
-        "en_US": "Cancel current changes",
-        "es_ES": "Cancelar los cambios actuales",
-        "fr_FR": "Annuler les modifications en cours",
-        "he_IL": "ביטול השינויים הנוכחיים",
-        "it_IT": "Annulla le modifiche correnti",
-        "ja_JP": "現在の変更をキャンセル",
-        "ko_KR": "현재 변경 취소",
-        "no_NO": "Avbryt gjeldende endringer",
-        "pl_PL": "Anuluj bieżące zmiany",
-        "pt_BR": "Cancelar alterações atuais",
-        "ru_RU": "Отменить текущие изменения",
-        "sv_SE": "Avbryt aktuella ändringar",
-        "th_TH": "ยกเลิกการเปลี่ยนแปลงปัจจุบัน",
-        "tr_TR": "Geçerli değişiklikleri iptal et",
-        "uk_UA": "Скасувати поточні зміни",
-        "zh_CN": "取消当前更改",
-        "zh_TW": "取消當前變更"
-      }
-    },
    {
      "ID": "MenuBarFileToolsTakeScreenshot",
      "Translations": {
--- a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs
+++ b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs
@@ -200,7 +200,7 @@ namespace Ryujinx.Ava.UI.Controls
                if (backupDir.Exists)
                {
                    cacheFiles.AddRange(backupDir.EnumerateFiles("*.cache"));
-                    cacheFiles.AddRange(mainDir.EnumerateFiles("*.info"));
+                    cacheFiles.AddRange(backupDir.EnumerateFiles("*.info"));
                }

                if (cacheFiles.Count > 0)
--- a/src/Ryujinx/UI/ViewModels/Input/ControllerInputViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/Input/ControllerInputViewModel.cs
@@ -68,21 +68,18 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
        }

        public async void ShowMotionConfig()
-        {      
+        {
            await MotionInputView.Show(this);
-            ParentModel.IsModified = true;
        }

        public async void ShowRumbleConfig()
-        {        
+        {
            await RumbleInputView.Show(this);
-            ParentModel.IsModified = true;
        }
        
        public async void ShowLedConfig()
        {
            await LedInputView.Show(this);
-            ParentModel.IsModified = true;
        }

        public void OnParentModelChanged()
--- a/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
@@ -91,19 +91,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
        public bool HasLed => SelectedGamepad.Features.HasFlag(GamepadFeaturesFlag.Led);
        public bool CanClearLed => SelectedGamepad.Name.ContainsIgnoreCase("DualSense");

-        public bool _isChangeTrackingActive;
-
-        public bool _isModified;
-        public bool IsModified
-        {
-            get => _isModified;
-            set 
-            {
-                _isModified = value;
-                OnPropertyChanged();
-            }
-        }
-
+        public bool IsModified { get; set; }
        public event Action NotifyChangesEvent;

        public PlayerIndex PlayerIdChoose
@@ -118,14 +106,14 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
            set
            {
                if (IsModified)
-                {                 
+                {
+
                    _playerIdChoose = value;
                    return;
                }
-             
+
                IsModified = false;
                _playerId = value;
-                _isChangeTrackingActive = false;

                if (!Enum.IsDefined<PlayerIndex>(_playerId))
                {
@@ -133,12 +121,13 @@ namespace Ryujinx.Ava.UI.ViewModels.Input

                }
                _isLoaded = false;
+
                LoadConfiguration();
                LoadDevice();
                LoadProfiles();

                _isLoaded = true;
-                _isChangeTrackingActive = true;
+
                OnPropertyChanged();
            }
        }
@@ -182,12 +171,11 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                            IsLeft = false;
                            break;
                    }
-                    
+
                    LoadInputDriver();
                    LoadProfiles();
-                    SetChangeTrackingActive();
                }
-       
+
                OnPropertyChanged();
                NotifyChanges();
            }
@@ -245,28 +233,14 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                        LoadConfiguration(LoadDefaultConfiguration());
                    }
                }
-                FindPairedDevice();
-                SetChangeTrackingActive();
+
                OnPropertyChanged();
                NotifyChanges();
            }
        }

-
        public InputConfig Config { get; set; }

-        public bool _notificationView;
-
-        public bool NotificationView
-        {
-            get => _notificationView;
-            set
-            {
-                _notificationView = value;
-                OnPropertyChanged();
-            }
-        }
-
        public InputViewModel(UserControl owner) : this()
        {
            if (Program.PreviewerDetached)
@@ -286,8 +260,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input

                PlayerId = PlayerIndex.Player1;
            }
-
-            _isChangeTrackingActive = true;
        }

        public InputViewModel()
@@ -324,54 +296,8 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
            {
                ConfigViewModel = new ControllerInputViewModel(this, new GamepadInputConfig(controllerInputConfig));
            }
-
-            FindPairedDevice();
        }

-        private void FindPairedDevice()
-        {
-            // This feature allows you to display a notification
-            // if a configuration is found, but the gamepad is not connected.
-            if (Config != null)
-            {
-                (DeviceType Type, string Id, string Name) activeDevice = Devices.FirstOrDefault(d => d.Id == Config.Id);
-
-                if (activeDevice.Id != Config.Id)
-                {
-                    // display notification when input device is turned off, and
-                    // if device and configuration do not match (different controllers)
-                    NotificationView = true; 
-                }
-                else
-                {
-                    NotificationView = false;
-                }
-            }
-            else
-            {
-                NotificationView = false;
-            }
-        }
-
-        private void SetChangeTrackingActive()
-        {
-          
-            if (_isChangeTrackingActive)
-            {
-                IsModified = true;
-            }
-        }
-
-
-        public void DisableDeviceForSaving()
-        {
-            // "Disabled" mode is available after unbinding the device
-            // NOTE: the IsModified flag to be able to apply the settings.
-            IsModified = true;
-            NotificationView = false;
-        }
-
-
        public void LoadDevice()
        {
            if (Config == null || Config.Backend == InputBackendType.Invalid)
@@ -437,35 +363,14 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
            }
        }

-        private async void HandleOnGamepadDisconnected(string id)
+        private void HandleOnGamepadDisconnected(string id)
        {
-            _isChangeTrackingActive = false;
-            await Dispatcher.UIThread.InvokeAsync(() =>
-            {
-                LoadDevices();
-                FindPairedDevice();
-                _isChangeTrackingActive = true;
-                return System.Threading.Tasks.Task.CompletedTask;
-            });
+            Dispatcher.UIThread.Post(LoadDevices);
        }

-        private async void HandleOnGamepadConnected(string id)
+        private void HandleOnGamepadConnected(string id)
        {
-            _isChangeTrackingActive = false;
-
-            await Dispatcher.UIThread.InvokeAsync(() =>
-            {
-                LoadDevices();
-
-                if (Config != null)
-                {
-                    // Load configuration after connection if it is in the configuration file
-                    IsModified = true;
-                    LoadSavedConfiguration(); 
-                }
-
-                _isChangeTrackingActive = true;
-            });
+            Dispatcher.UIThread.Post(LoadDevices);
        }

        private string GetCurrentGamepadId()
@@ -908,25 +813,8 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
            }
        }

-        public void LoadSavedConfiguration()
-        {
-            if (IsModified) // Fixes random gamepad appearance in "disabled" option
-            {
-                LoadDevice();
-                LoadConfiguration();
-                IsModified = false;
-                OnPropertyChanged();
-            }
-        }
-
        public void Save()
        {
-            
-            if (!IsModified)
-            {
-                return; //If the input settings were not touched, then do nothing
-            }
-
            IsModified = false;

            List<InputConfig> newConfig = [];
--- a/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml.cs
@@ -63,9 +63,8 @@ namespace Ryujinx.Ava.UI.Views.Input
                };

                if (!float.IsNaN(_changeSlider) && _changeSlider != (float)check.Value)
-                {     
-                    FlagInputConfigChanged();
-
+                {
+                    (DataContext as ControllerInputViewModel)!.ParentModel.IsModified = true;
                    _changeSlider = (float)check.Value;
                }
            }
@@ -75,8 +74,7 @@ namespace Ryujinx.Ava.UI.Views.Input
        {
            if (sender is CheckBox { IsPointerOver: true })
            {
-                FlagInputConfigChanged();
-
+                (DataContext as ControllerInputViewModel)!.ParentModel.IsModified = true;
                _currentAssigner?.Cancel();
                _currentAssigner = null;
            }
@@ -103,7 +101,7 @@ namespace Ryujinx.Ava.UI.Views.Input
                        this.Focus(NavigationMethod.Pointer);

                        PointerPressed += MouseClick;
-                       
+
                        ControllerInputViewModel viewModel = (DataContext as ControllerInputViewModel);

                        IKeyboard keyboard =
@@ -116,7 +114,7 @@ namespace Ryujinx.Ava.UI.Views.Input
                            if (e.ButtonValue.HasValue)
                            {
                                Button buttonValue = e.ButtonValue.Value;
-                                FlagInputConfigChanged();
+                                viewModel.ParentModel.IsModified = true;

                                switch (button.Name)
                                {
@@ -210,11 +208,6 @@ namespace Ryujinx.Ava.UI.Views.Input
            }
        }

-        private void FlagInputConfigChanged()
-        {
-            (DataContext as ControllerInputViewModel)!.ParentModel.IsModified = true;
-        }
-
        private void MouseClick(object sender, PointerPressedEventArgs e)
        {
            bool shouldUnbind = e.GetCurrentPoint(this).Properties.IsMiddleButtonPressed;
@@ -246,6 +239,7 @@ namespace Ryujinx.Ava.UI.Views.Input
            {
                gamepad?.ClearLed();
            }
+            
            _currentAssigner?.Cancel();
            _currentAssigner = null;
        }
--- a/src/Ryujinx/UI/Views/Input/InputView.axaml
+++ b/src/Ryujinx/UI/Views/Input/InputView.axaml
@@ -50,21 +50,13 @@
                    <Grid.ColumnDefinitions>
                        <ColumnDefinition Width="Auto"/>
                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="Auto"/>
                    </Grid.ColumnDefinitions>
-                    <StackPanel 
-                        Orientation="Vertical"                             
+                    <TextBlock
                        Margin="5,0,10,0"
+                        Width="90"
                        HorizontalAlignment="Left"
                        VerticalAlignment="Center"
-                        Width="90">
-                        <TextBlock
-                            Text="{ext:Locale ControllerSettingsPlayer}" />
-                         <TextBlock                        
-                            Classes="pending" 
-                            Text ="{ext:Locale ControllerSettingsModifiedNotification}"
-                            IsVisible="{Binding IsModified}"/>
-                    </StackPanel>
+                        Text="{ext:Locale ControllerSettingsPlayer}" />
                    <ComboBox
                        Grid.Column="1"
                        Name="PlayerIndexBox"
@@ -79,18 +71,6 @@
                            </DataTemplate>
                        </ComboBox.ItemTemplate>
                    </ComboBox>
-                    <Button
-                        Grid.Column="2"
-                            MinWidth="0"
-                            Margin="5,0,0,0"
-                            VerticalAlignment="Center"
-                            ToolTip.Tip="{ext:Locale ControllerSettingsCancelCurrentChangesToolTip}"
-                            Command="{Binding LoadSavedConfiguration}">
-                        <ui:SymbolIcon
-                            Symbol="Cancel"
-                            FontSize="15"
-                            Height="20" />
-                    </Button>
                </Grid>
                <!-- Profile Selection -->
                <Grid
@@ -194,7 +174,7 @@
                        MinWidth="0"
                        Margin="5,0,0,0"
                        VerticalAlignment="Center"
-                        Command="{Binding LoadDevice}">
+                        Command="{Binding LoadDevices}">
                        <ui:SymbolIcon
                            Symbol="Refresh"
                            FontSize="15"
@@ -231,37 +211,15 @@
                </Grid>
            </Grid>
        </StackPanel>
-        <ContentControl IsVisible="{Binding NotificationView}">
-            <ContentControl.Content>
-                <StackPanel>
-                    <TextBlock 
-                        Margin="5,20,0,0"
-                        Text="{ext:Locale ControllerSettingsDisableDeviceForSaving}" />
-        
-                    <Button
-                        MinWidth="0"
-                        Width="90"
-                        Height="27"
-                        Margin="5,10,0,0"
-                        VerticalAlignment="Center"
-                        Command="{Binding DisableDeviceForSaving}">
-                        <TextBlock
-                            Text="{ext:Locale ControllerSettingsUnlink}"
-                            VerticalAlignment="Center"
-                            HorizontalAlignment="Center" />
-                    </Button>
-                </StackPanel>
-            </ContentControl.Content>
+        <ContentControl Content="{Binding ConfigViewModel}" IsVisible="{Binding ShowSettings}">
+            <ContentControl.DataTemplates>
+                <DataTemplate DataType="viewModels:ControllerInputViewModel">
+                    <views:ControllerInputView />
+                </DataTemplate>
+                <DataTemplate DataType="viewModels:KeyboardInputViewModel">
+                    <views:KeyboardInputView />
+                </DataTemplate>
+            </ContentControl.DataTemplates>
        </ContentControl>
-            <ContentControl Content="{Binding ConfigViewModel}" IsVisible="{Binding ShowSettings}">        
-                <ContentControl.DataTemplates>
-                    <DataTemplate DataType="viewModels:ControllerInputViewModel">
-                        <views:ControllerInputView />
-                    </DataTemplate>
-                    <DataTemplate DataType="viewModels:KeyboardInputViewModel">
-                        <views:KeyboardInputView />
-                    </DataTemplate>
-                </ContentControl.DataTemplates>
-            </ContentControl>
    </StackPanel>
 </UserControl>
--- a/src/Ryujinx/UI/Views/Input/InputView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Input/InputView.axaml.cs
@@ -62,15 +62,14 @@ namespace Ryujinx.Ava.UI.Views.Input
                    }
                    return;
                }
+                
+                ViewModel.PlayerId = ViewModel.PlayerIdChoose;

                ViewModel.IsModified = false;
-                ViewModel.PlayerId = ViewModel.PlayerIdChoose;
-                               
            }
            
        }

-
        public void Dispose()
        {
            ViewModel.Dispose();
--- a/src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml.cs
@@ -8,8 +8,6 @@ using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels.Input;
 using Ryujinx.Input;
 using Ryujinx.Input.Assigner;
-using System.Collections.Generic;
-using System;
 using Button = Ryujinx.Input.Button;
 using Key = Ryujinx.Common.Configuration.Hid.Key;

@@ -75,7 +73,7 @@ namespace Ryujinx.Ava.UI.Views.Input
                        if (e.ButtonValue.HasValue)
                        {
                            Button buttonValue = e.ButtonValue.Value;
-                            FlagInputConfigChanged();
+                            viewModel.ParentModel.IsModified = true;

                            switch (button.Name)
                            {
@@ -186,74 +184,15 @@ namespace Ryujinx.Ava.UI.Views.Input
            }
        }

-        private void FlagInputConfigChanged()
-        {
-            (DataContext as KeyboardInputViewModel)!.ParentModel.IsModified = true;
-        }
-
        private void MouseClick(object sender, PointerPressedEventArgs e)
        {
            bool shouldUnbind = e.GetCurrentPoint(this).Properties.IsMiddleButtonPressed;

-            bool shouldRemoveBinding = e.GetCurrentPoint(this).Properties.IsRightButtonPressed;
-
-            if (shouldRemoveBinding)
-            {
-                DeleteBind();
-            }
-
            _currentAssigner?.Cancel(shouldUnbind);

            PointerPressed -= MouseClick;
        }

-        private void DeleteBind()
-        {
-            if (DataContext is not KeyboardInputViewModel viewModel)
-                return;
-
-            if (_currentAssigner != null)
-            {
-                Dictionary<string, Action> buttonActions = new Dictionary<string, Action>
-                {
-                    { "ButtonZl", () => viewModel.Config.ButtonZl = Key.Unbound },
-                    { "ButtonL", () => viewModel.Config.ButtonL = Key.Unbound },
-                    { "ButtonMinus", () => viewModel.Config.ButtonMinus = Key.Unbound },
-                    { "LeftStickButton", () => viewModel.Config.LeftStickButton = Key.Unbound },
-                    { "LeftStickUp", () => viewModel.Config.LeftStickUp = Key.Unbound },
-                    { "LeftStickDown", () => viewModel.Config.LeftStickDown = Key.Unbound },
-                    { "LeftStickRight", () => viewModel.Config.LeftStickRight = Key.Unbound },
-                    { "LeftStickLeft", () => viewModel.Config.LeftStickLeft = Key.Unbound },
-                    { "DpadUp", () => viewModel.Config.DpadUp = Key.Unbound },
-                    { "DpadDown", () => viewModel.Config.DpadDown = Key.Unbound },
-                    { "DpadLeft", () => viewModel.Config.DpadLeft = Key.Unbound },
-                    { "DpadRight", () => viewModel.Config.DpadRight = Key.Unbound },
-                    { "LeftButtonSr", () => viewModel.Config.LeftButtonSr = Key.Unbound },
-                    { "LeftButtonSl", () => viewModel.Config.LeftButtonSl = Key.Unbound },
-                    { "RightButtonSr", () => viewModel.Config.RightButtonSr = Key.Unbound },
-                    { "RightButtonSl", () => viewModel.Config.RightButtonSl = Key.Unbound },
-                    { "ButtonZr", () => viewModel.Config.ButtonZr = Key.Unbound },
-                    { "ButtonR", () => viewModel.Config.ButtonR = Key.Unbound },
-                    { "ButtonPlus", () => viewModel.Config.ButtonPlus = Key.Unbound },
-                    { "ButtonA", () => viewModel.Config.ButtonA = Key.Unbound },
-                    { "ButtonB", () => viewModel.Config.ButtonB = Key.Unbound },
-                    { "ButtonX", () => viewModel.Config.ButtonX = Key.Unbound },
-                    { "ButtonY", () => viewModel.Config.ButtonY = Key.Unbound },
-                    { "RightStickButton", () => viewModel.Config.RightStickButton = Key.Unbound },
-                    { "RightStickUp", () => viewModel.Config.RightStickUp = Key.Unbound },
-                    { "RightStickDown", () => viewModel.Config.RightStickDown = Key.Unbound },
-                    { "RightStickRight", () => viewModel.Config.RightStickRight = Key.Unbound },
-                    { "RightStickLeft", () => viewModel.Config.RightStickLeft = Key.Unbound }
-                };
-
-                if (buttonActions.TryGetValue(_currentAssigner.ToggledButton.Name, out Action action))
-                {
-                    action();
-                    FlagInputConfigChanged();
-                }
-            }
-        }
-
        protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
        {
            base.OnDetachedFromVisualTree(e);
--- a/src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml.cs
@@ -8,8 +8,6 @@ using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Input;
 using Ryujinx.Input.Assigner;
-using System.Collections.Generic;
-using System;
 using Button = Ryujinx.Input.Button;
 using Key = Ryujinx.Common.Configuration.Hid.Key;

@@ -48,47 +46,12 @@ namespace Ryujinx.Ava.UI.Views.Settings
        private void MouseClick(object sender, PointerPressedEventArgs e)
        {
            bool shouldUnbind = e.GetCurrentPoint(this).Properties.IsMiddleButtonPressed;
-            bool shouldRemoveBinding = e.GetCurrentPoint(this).Properties.IsRightButtonPressed;

-            if (shouldRemoveBinding)
-            {
-                DeleteBind();
-            }
-          
            _currentAssigner?.Cancel(shouldUnbind);

            PointerPressed -= MouseClick;
        }

-        private void DeleteBind()
-        {
-            if (DataContext is not SettingsViewModel viewModel)
-                return;
-
-            if (_currentAssigner != null)
-            {
-                Dictionary<string, Action> buttonActions = new Dictionary<string, Action>
-                {
-                    { "ToggleVSyncMode", () => viewModel.KeyboardHotkey.ToggleVSyncMode = Key.Unbound },
-                    { "Screenshot", () => viewModel.KeyboardHotkey.Screenshot = Key.Unbound },
-                    { "ShowUI", () => viewModel.KeyboardHotkey.ShowUI = Key.Unbound },
-                    { "Pause", () => viewModel.KeyboardHotkey.Pause = Key.Unbound },
-                    { "ToggleMute", () => viewModel.KeyboardHotkey.ToggleMute = Key.Unbound },
-                    { "ResScaleUp", () => viewModel.KeyboardHotkey.ResScaleUp = Key.Unbound },
-                    { "ResScaleDown", () => viewModel.KeyboardHotkey.ResScaleDown = Key.Unbound },
-                    { "VolumeUp", () => viewModel.KeyboardHotkey.VolumeUp = Key.Unbound },
-                    { "VolumeDown", () => viewModel.KeyboardHotkey.VolumeDown = Key.Unbound },
-                    { "CustomVSyncIntervalIncrement", () => viewModel.KeyboardHotkey.CustomVSyncIntervalIncrement = Key.Unbound },
-                    { "CustomVSyncIntervalDecrement", () => viewModel.KeyboardHotkey.CustomVSyncIntervalDecrement = Key.Unbound }
-                };
-
-                if (buttonActions.TryGetValue(_currentAssigner.ToggledButton.Name, out Action action))
-                {
-                    action();
-                }
-            }
-        }
-
        private void Button_IsCheckedChanged(object sender, RoutedEventArgs e)
        {
            if (sender is ToggleButton button)
--- a/src/Ryujinx/Updater.cs
+++ b/src/Ryujinx/Updater.cs
@@ -43,17 +43,9 @@ namespace Ryujinx.Ava
        private const int ConnectionCount = 4;

        private static string _buildVer;
+        

-        private static readonly string _platformExt = 
-            RunningPlatform.IsMacOS 
-                ? "macos_universal.app.tar.gz"
-                : RunningPlatform.IsWindows
-                    ? "win_x64.zip"
-                    : RunningPlatform.IsX64Linux
-                        ? "linux_x64.tar.gz"
-                        : RunningPlatform.IsArmLinux
-                            ? "linux_arm64.tar.gz"
-                            : throw new PlatformNotSupportedException();
+        private static readonly string _platformExt = BuildPlatformExtension();
        
        private static string _buildUrl;
        private static long _buildSize;
@@ -780,5 +772,34 @@ namespace Ryujinx.Ava
        public static void CleanupUpdate() =>
            Directory.GetFiles(_homeDir, "*.ryuold", SearchOption.AllDirectories)
                .ForEach(File.Delete);
+        
+        private static string BuildPlatformExtension()
+        {
+            if (RunningPlatform.IsMacOS)
+                return "macos_universal.app.tar.gz";
+
+#pragma warning disable CS8509 // It is exhaustive for any values this can contain.
+            string osPrefix = RunningPlatform.CurrentOS switch
+            {
+                OperatingSystemType.Linux => "linux",
+                OperatingSystemType.Windows => "win"
+            };
+
+            string archSuffix = RunningPlatform.Architecture switch
+            {
+                Architecture.Arm64 => "arm64",
+                Architecture.X64 => "x64",
+                _ => throw new PlatformNotSupportedException($"Unknown architecture {Enum.GetName(RunningPlatform.Architecture)}."),
+            };
+            
+            string fileExtension = RunningPlatform.CurrentOS switch
+#pragma warning restore CS8509
+            {
+                OperatingSystemType.Linux => "tar.gz",
+                OperatingSystemType.Windows => "zip"
+            };
+
+            return $"{osPrefix}_{archSuffix}.{fileExtension}";
+        }
    }
 }
--- a/src/Ryujinx/Utilities/PlayReport/PlayReports.Formatters.cs
+++ b/src/Ryujinx/Utilities/PlayReport/PlayReports.Formatters.cs
@@ -115,6 +115,11 @@ namespace Ryujinx.Ava.Utilities.PlayReport
                return $"Achievement Unlocked - ID: {anniversary}";
            }

+            if (values.Matched.ContainsKey("is_created"))
+            {
+                return "Edited a Custom Stage!"; 
+            }
+
            if (values.Matched.ContainsKey("adv_slot"))
            {
                return
--- a/src/Ryujinx/Utilities/PlayReport/PlayReports.cs
+++ b/src/Ryujinx/Utilities/PlayReport/PlayReports.cs
@@ -71,7 +71,7 @@ namespace Ryujinx.Ava.Utilities.PlayReport
                        [
                            // Metadata to figure out what PlayReport we have.
                            "match_mode", "match_submode", "anniversary", "fighter", "reason", "challenge_count",
-                            "adv_slot",
+                            "adv_slot", "is_created",
                            // List of Fighters
                            "player_1_fighter", "player_2_fighter", "player_3_fighter", "player_4_fighter",
                            "player_5_fighter", "player_6_fighter", "player_7_fighter", "player_8_fighter",