Merge update

This commit is contained in:
Vic 2022-11-02 14:12:42 +08:00
parent da755fa8c7
commit f8346e4c18
2 changed files with 3 additions and 2 deletions

View file

@ -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);
}

View file

@ -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<ProgramSource> ProgramSources { get; set; } = new List<ProgramSource>();
public List<DisabledProgramSource> DisabledProgramSources { get; set; } = new List<DisabledProgramSource>();
[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<string>(); // Custom suffixes only
public string[] CustomProtocols { get; set; } = Array.Empty<string>();