From 29f0ae039557088f86c1fa2bd0d02ee5c0d37c79 Mon Sep 17 00:00:00 2001 From: Davide Giacometti Date: Thu, 2 Jun 2022 11:47:53 +0200 Subject: [PATCH] [Settings][PTRun]Fix plugin disabled error with search (#18534) --- .../ViewModels/PowerLauncherViewModel.cs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/settings-ui/Settings.UI.Library/ViewModels/PowerLauncherViewModel.cs b/src/settings-ui/Settings.UI.Library/ViewModels/PowerLauncherViewModel.cs index 2f01dc502c..2c8e555b73 100644 --- a/src/settings-ui/Settings.UI.Library/ViewModels/PowerLauncherViewModel.cs +++ b/src/settings-ui/Settings.UI.Library/ViewModels/PowerLauncherViewModel.cs @@ -94,11 +94,6 @@ namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels break; } - foreach (var plugin in Plugins) - { - plugin.PropertyChanged += OnPluginInfoChange; - } - SearchPluginsCommand = new RelayCommand(SearchPlugins); } @@ -412,6 +407,10 @@ namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels if (_plugins == null) { _plugins = new ObservableCollection(settings.Plugins.Select(x => new PowerLauncherPluginViewModel(x, isDark))); + foreach (var plugin in Plugins) + { + plugin.PropertyChanged += OnPluginInfoChange; + } } return _plugins; @@ -420,7 +419,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels public bool ShowAllPluginsDisabledWarning { - get => EnablePowerLauncher && Plugins.Any() && Plugins.All(x => x.Disabled); + get => EnablePowerLauncher && settings.Plugins.Any() && settings.Plugins.All(x => x.Disabled); } public bool ShowPluginsLoadingMessage