From f5701d44ac62bf70b2026189257c0d053cd04b73 Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Mon, 14 Nov 2022 15:27:06 +0800 Subject: [PATCH] fix merge --- Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs index d739aab0a..c13b32e80 100644 --- a/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs +++ b/Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs @@ -402,7 +402,7 @@ namespace Flow.Launcher.Plugin.Program.Programs return programs; } - private static IEnumerable PATHPrograms(string[] suffixes) + private static IEnumerable PATHPrograms(string[] suffixes, string[] protocols) { var pathEnv = Environment.GetEnvironmentVariable("Path"); if (String.IsNullOrEmpty(pathEnv)) @@ -418,14 +418,14 @@ namespace Flow.Launcher.Plugin.Program.Programs .Select(x => Extension(x) switch { ShortcutExtension => LnkProgram(x), - UrlExtension => UrlProgram(x), + UrlExtension => UrlProgram(x, protocols), ExeExtension => ExeProgram(x), _ => Win32Program(x) }); return programs; } - private static IEnumerable AppPathsPrograms(string[] suffixes) + private static IEnumerable AppPathsPrograms(string[] suffixes, string[] protocols) { // https://msdn.microsoft.com/en-us/library/windows/desktop/ee872121 const string appPaths = @"SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths"; @@ -585,7 +585,7 @@ namespace Flow.Launcher.Plugin.Program.Programs if (settings.EnablePATHSource) { - var path = PATHPrograms(settings.GetSuffixes()); + var path = PATHPrograms(settings.GetSuffixes(), protocols); autoIndexPrograms = autoIndexPrograms.Concat(path); }