From f8346e4c18e06076b6f2c403d1d9f7ab806a65ad Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Wed, 2 Nov 2022 14:12:42 +0800 Subject: [PATCH] Merge update --- Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs | 2 +- Plugins/Flow.Launcher.Plugin.Program/Settings.cs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs index 82d56afe4..c2bbf6df8 100644 --- a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs +++ b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs @@ -594,7 +594,7 @@ namespace Flow.Launcher.Plugin.Program.Programs if (settings.EnablePATHSource) { - var path = PATHPrograms(settings.ProgramSuffixes); + var path = PATHPrograms(settings.GetSuffixes()); autoIndexPrograms = autoIndexPrograms.Concat(path); } diff --git a/Plugins/Flow.Launcher.Plugin.Program/Settings.cs b/Plugins/Flow.Launcher.Plugin.Program/Settings.cs index 2553d1e26..4929d4b09 100644 --- a/Plugins/Flow.Launcher.Plugin.Program/Settings.cs +++ b/Plugins/Flow.Launcher.Plugin.Program/Settings.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text.Json.Serialization; +using PropertyChanged; using Windows.Foundation.Metadata; namespace Flow.Launcher.Plugin.Program @@ -13,7 +14,7 @@ namespace Flow.Launcher.Plugin.Program public List ProgramSources { get; set; } = new List(); public List DisabledProgramSources { get; set; } = new List(); - [Obsolete, JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] + [Obsolete("Should use GetSuffixes() instead."), JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] public string[] ProgramSuffixes { get; set; } = null; public string[] CustomSuffixes { get; set; } = Array.Empty(); // Custom suffixes only public string[] CustomProtocols { get; set; } = Array.Empty();