From 9fc0e03b3dd010bf324009f42646438fb9149978 Mon Sep 17 00:00:00 2001 From: Hongtao Zhang Date: Sat, 8 Jan 2022 16:03:53 -0600 Subject: [PATCH] detect windows version --- Plugins/Flow.Launcher.Plugin.Program/Main.cs | 2 +- Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.Program/Main.cs b/Plugins/Flow.Launcher.Plugin.Program/Main.cs index cb0a2a4f3..3f89d63d3 100644 --- a/Plugins/Flow.Launcher.Plugin.Program/Main.cs +++ b/Plugins/Flow.Launcher.Plugin.Program/Main.cs @@ -128,7 +128,7 @@ namespace Flow.Launcher.Plugin.Program await indexTask; Win32.WatchProgramUpdate(_settings); - UWP.WatchUWPInstallation(); + UWP.WatchPackageChange(); } public static void IndexWin32Programs() diff --git a/Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs b/Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs index b3d39bdbc..86f5f38c4 100644 --- a/Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs +++ b/Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs @@ -18,6 +18,7 @@ using Flow.Launcher.Plugin.Program.Logger; using Rect = System.Windows.Rect; using Flow.Launcher.Plugin.SharedModels; using Flow.Launcher.Infrastructure.Logger; +using System.Runtime.Versioning; namespace Flow.Launcher.Plugin.Program.Programs { @@ -251,12 +252,13 @@ namespace Flow.Launcher.Plugin.Program.Programs watcher.EnableRaisingEvents = true; } - public static void WatchUWPInstallation() + public static void WatchPackageChange() { - PackageCatalog.OpenForCurrentUser().PackageStatusChanged += (_, _) => - { - Task.Delay(10000).ContinueWith(t => Main.IndexUwpPrograms()); - }; + if (Environment.OSVersion.Version.Build >= 19041) + PackageCatalog.OpenForCurrentUser().PackageStatusChanged += (_, _) => + { + Task.Delay(10000).ContinueWith(t => Main.IndexUwpPrograms()); + }; } public override string ToString()