From 60ba7b71f26b928c98b2f8412e5ffaa6b4fdec5d Mon Sep 17 00:00:00 2001 From: Emmanuel Hansen Date: Mon, 17 Oct 2022 16:48:14 +0000 Subject: [PATCH] remove property changed call in time zone validation (#3752) --- Ryujinx.Ava/Ui/ViewModels/SettingsViewModel.cs | 2 -- Ryujinx.Ava/Ui/Windows/SettingsWindow.axaml.cs | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Ryujinx.Ava/Ui/ViewModels/SettingsViewModel.cs b/Ryujinx.Ava/Ui/ViewModels/SettingsViewModel.cs index 10dd2da3..f4807023 100644 --- a/Ryujinx.Ava/Ui/ViewModels/SettingsViewModel.cs +++ b/Ryujinx.Ava/Ui/ViewModels/SettingsViewModel.cs @@ -295,8 +295,6 @@ namespace Ryujinx.Ava.Ui.ViewModels if (_validTzRegions.Contains(location)) { TimeZone = location; - - OnPropertyChanged(nameof(TimeZone)); } } diff --git a/Ryujinx.Ava/Ui/Windows/SettingsWindow.axaml.cs b/Ryujinx.Ava/Ui/Windows/SettingsWindow.axaml.cs index 73ac0624..810beb3e 100644 --- a/Ryujinx.Ava/Ui/Windows/SettingsWindow.axaml.cs +++ b/Ryujinx.Ava/Ui/Windows/SettingsWindow.axaml.cs @@ -37,7 +37,7 @@ namespace Ryujinx.Ava.Ui.Windows InitializeComponent(); Load(); - FuncMultiValueConverter converter = new(parts => string.Format("{0} {1} {2}", parts.ToArray())); + FuncMultiValueConverter converter = new(parts => string.Format("{0} {1} {2}", parts.ToArray()).Trim()); MultiBinding tzMultiBinding = new() { Converter = converter }; tzMultiBinding.Bindings.Add(new Binding("UtcDifference")); tzMultiBinding.Bindings.Add(new Binding("Location"));