Merge 21c37ca8a5 into 30fef8e96e

docs/compatibility.csv

@@ -2480,6 +2480,7 @@
 010081C0191D8000,"Rune Factory 3 Special",,playable,2023-10-15 08:32:49
 010051D00E3A4000,"Rune Factory 4 Special",32-bit;crash;nvdec,ingame,2023-05-06 08:49:17
 010014D01216E000,"Rune Factory 5 (JP)",gpu,ingame,2021-06-01 12:00:36
+010071E0145F8000,"Rustler",,playable,2025-02-10 20:17:12
 0100E21013908000,"RWBY: Grimm Eclipse - Definitive Edition",online-broken,playable,2022-11-03 10:44:01
 010012C0060F0000,"RXN -Raijin-",nvdec,playable,2021-01-10 16:05:43
 0100B8B012ECA000,"S.N.I.P.E.R. - Hunter Scope",,playable,2021-04-19 15:58:09

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -107,7 +107,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         [ObservableProperty] private ApplicationContextMenu _gridAppContextMenu;
         [ObservableProperty] private bool _updateAvailable;
 
-        public static AsyncRelayCommand UpdateCommand => Commands.Create(async () =>
+        public static AsyncRelayCommand UpdateCommand { get; } = Commands.Create(async () =>
         {
             if (Updater.CanUpdate(true))
                 await Updater.BeginUpdateAsync(true);

src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs

@@ -51,12 +51,8 @@ namespace Ryujinx.Ava.UI.Views.Main
             XciTrimmerMenuItem.Command = Commands.Create(XCITrimmerWindow.Show);
             AboutWindowMenuItem.Command = Commands.Create(AboutWindow.Show);
             CompatibilityListMenuItem.Command = Commands.Create(() => CompatibilityList.Show());
-            
+
-            UpdateMenuItem.Command = Commands.Create(async () =>
+            UpdateMenuItem.Command = MainWindowViewModel.UpdateCommand;
-            {
-                if (Updater.CanUpdate(true))
-                    await Updater.BeginUpdateAsync(true);
-            });
 
             FaqMenuItem.Command = 
                 SetupGuideMenuItem.Command = 

src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml

@@ -283,18 +283,24 @@
         <StackPanel 
             Grid.Column="4"
             Margin="0,0,5,0"
-            IsVisible="{Binding EnableNonGameRunningControls}"
             Orientation="Horizontal">
+            <StackPanel.IsVisible>
+                <MultiBinding Converter="{x:Static BoolConverters.And}">
+                    <Binding Path="EnableNonGameRunningControls" />
+                    <Binding Path="UpdateAvailable" />
+                </MultiBinding>
+            </StackPanel.IsVisible>
             <Button Margin="0, 0, 5, 0"
-                    IsVisible="{Binding UpdateAvailable}"
+                    Command="{Binding UpdateCommand}"
-                    Command="{Binding UpdateCommand}">
+                    Background="{DynamicResource SystemAccentColor}">
                 <TextBlock
                     Margin="-5"
+                    Foreground="Black"
                     HorizontalAlignment="Right"
                     VerticalAlignment="Center"
                     Text="{ext:Locale UpdaterBackgroundStatusBarButtonText}" />
             </Button>
-            <controls:MiniVerticalSeparator IsVisible="{Binding UpdateAvailable}" />
+            <controls:MiniVerticalSeparator Margin="5,0,0,0"/>
         </StackPanel>
         <StackPanel
             Grid.Column="5"

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

@@ -413,8 +413,7 @@ namespace Ryujinx.Ava.UI.Windows
                 case UpdaterType.CheckInBackground:
                     if ((await Updater.CheckVersionAsync()).TryGet(out (Version Current, Version Incoming) versions))
                     {
-                        if (versions.Current < versions.Incoming)
+                        Dispatcher.UIThread.Post(() => RyujinxApp.MainWindow.ViewModel.UpdateAvailable = versions.Current < versions.Incoming);
-                            Dispatcher.UIThread.Post(() => RyujinxApp.MainWindow.ViewModel.UpdateAvailable = true);
                     }
                     break;
             }

src/Ryujinx/Updater.cs

@@ -163,7 +163,7 @@ namespace Ryujinx.Ava
 
                 _running = false;
 
-                return (currentVersion, null);
+                return default;
             }
 
             return (currentVersion, newVersion);
@@ -178,7 +178,11 @@ namespace Ryujinx.Ava
 
             _running = true;
 
-            (Version currentVersion, Version newVersion) = (await CheckVersionAsync(showVersionUpToDate)).OrDefault();
+            Optional<(Version, Version)> versionTuple = await CheckVersionAsync(showVersionUpToDate);
+
+            if (_running is false || !versionTuple.HasValue) return;
+
+            (Version currentVersion, Version newVersion) = versionTuple.Value;
 
             if (newVersion <= currentVersion)
             {