Skip to content

Commit 8d4a21e

Browse files
Merge remote-tracking branch 'upstream/dev' into FixProgramIcons
2 parents e1220ee + 3a56bf4 commit 8d4a21e

File tree

2 files changed

+4
-5
lines changed
  • Plugins
    • Flow.Launcher.Plugin.PluginsManager
    • Flow.Launcher.Plugin.Program/Programs

2 files changed

+4
-5
lines changed

Plugins/Flow.Launcher.Plugin.PluginsManager/Main.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public async Task InitAsync(PluginInitContext context)
3737
contextMenu = new ContextMenu(Context);
3838
pluginManager = new PluginsManager(Context, Settings);
3939

40-
await pluginManager.UpdateManifestAsync();
40+
_ = pluginManager.UpdateManifestAsync();
4141
}
4242

4343
public List<Result> LoadContextMenus(Result selectedResult)
@@ -74,4 +74,4 @@ public string GetTranslatedPluginDescription()
7474
return Context.API.GetTranslation("plugin_pluginsmanager_plugin_description");
7575
}
7676
}
77-
}
77+
}

Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,6 @@ private static IEnumerable<Win32> UnregisteredPrograms(List<Settings.ProgramSour
390390
_ => Win32Program(x)
391391
});
392392

393-
394393
return programs;
395394
}
396395

@@ -411,7 +410,7 @@ private static IEnumerable<Win32> StartMenuPrograms(string[] suffixes)
411410
ShortcutExtension => LnkProgram(x),
412411
UrlExtension => UrlProgram(x),
413412
_ => Win32Program(x)
414-
}).Where(x => x.Valid);
413+
});
415414
return programs;
416415
}
417416

@@ -569,7 +568,7 @@ public static Win32[] All(Settings settings)
569568

570569
autoIndexPrograms = ProgramsHasher(autoIndexPrograms);
571570

572-
return programs.Concat(autoIndexPrograms).Distinct().ToArray();
571+
return programs.Concat(autoIndexPrograms).Where(x => x.Valid).Distinct().ToArray();
573572
}
574573
#if DEBUG //This is to make developer aware of any unhandled exception and add in handling.
575574
catch (Exception)

0 commit comments

Comments
 (0)