From 6acd86c890cd03a4bcf4eacd6ef1412c7cba2935 Mon Sep 17 00:00:00 2001 From: Evan Husted Date: Wed, 6 Nov 2024 19:46:20 -0600 Subject: [PATCH] Fix canary updater & checking if current build is canary. --- src/Ryujinx.Common/ReleaseInformation.cs | 4 ++-- src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml.cs | 2 +- src/Ryujinx/Updater.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Ryujinx.Common/ReleaseInformation.cs b/src/Ryujinx.Common/ReleaseInformation.cs index 888c57e81..523479d82 100644 --- a/src/Ryujinx.Common/ReleaseInformation.cs +++ b/src/Ryujinx.Common/ReleaseInformation.cs @@ -28,9 +28,9 @@ namespace Ryujinx.Common public static bool IsFlatHubBuild => IsValid && ReleaseChannelOwner.Equals(FlatHubChannel); - public static bool IsCanaryBuild => IsValid && ReleaseChannelOwner.Equals(CanaryChannel); + public static bool IsCanaryBuild => IsValid && ReleaseChannelName.Equals(CanaryChannel); - public static bool IsReleaseBuild => IsValid && ReleaseChannelOwner.Equals(ReleaseChannel); + public static bool IsReleaseBuild => IsValid && ReleaseChannelName.Equals(ReleaseChannel); public static string Version => IsValid ? BuildVersion : Assembly.GetEntryAssembly()!.GetCustomAttribute()?.InformationalVersion; } diff --git a/src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml.cs b/src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml.cs index 068dee350..fd413d2f9 100644 --- a/src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml.cs +++ b/src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml.cs @@ -33,7 +33,7 @@ namespace Ryujinx.Ava.UI.Views.Main LocaleManager.Instance.LocaleChanged += () => Dispatcher.UIThread.Post(() => { if (Window.ViewModel.EnableNonGameRunningControls) - Refresh_OnClick(null, null); + Window.LoadApplications(); }); } } diff --git a/src/Ryujinx/Updater.cs b/src/Ryujinx/Updater.cs index 7005fe528..7fc362cda 100644 --- a/src/Ryujinx/Updater.cs +++ b/src/Ryujinx/Updater.cs @@ -156,7 +156,7 @@ namespace Ryujinx.Ava try { - newVersion = Version.Parse(_buildVer); + newVersion = Version.Parse(ReleaseInformation.IsCanaryBuild ? _buildVer.Split(' ')[1] : _buildVer); } catch {