From 6e9e51ec4d674867deb283dd721dd485978cd4e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=98=E9=9F=AC=20=E5=BC=A0?= <hongtao_zhang@outlook.com>
Date: Sun, 3 Jan 2021 10:19:05 +0800
Subject: [PATCH] Error handling for OperationCancelledException in Program
 plugin

---
 Plugins/Flow.Launcher.Plugin.Program/Main.cs | 39 ++++++++++++++------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Program/Main.cs b/Plugins/Flow.Launcher.Plugin.Program/Main.cs
index 0d693d363..954c238a9 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Main.cs
@@ -47,20 +47,35 @@ namespace Flow.Launcher.Plugin.Program
             win32 = _win32s;
             uwps = _uwps;
 
-
-            var result = await Task.Run(delegate
+            try
             {
-                return win32.Cast<IProgram>()
-                    .Concat(uwps)
-                    .AsParallel()
-                    .WithCancellation(token)
-                    .Where(p => p.Enabled)
-                    .Select(p => p.Result(query.Search, _context.API))
-                    .Where(r => r?.Score > 0)
-                    .ToList();
-            }, token).ConfigureAwait(false);
+                var result = await Task.Run(delegate
+                {
+                    try
+                    {
+                        return win32.Cast<IProgram>()
+                            .Concat(uwps)
+                            .AsParallel()
+                            .WithCancellation(token)
+                            .Where(p => p.Enabled)
+                            .Select(p => p.Result(query.Search, _context.API))
+                            .Where(r => r?.Score > 0)
+                            .ToList();
+                    }
+                    catch (OperationCanceledException)
+                    {
+                        return null;
+                    }
+                }, token).ConfigureAwait(false);
 
-            return result;
+                token.ThrowIfCancellationRequested();
+
+                return result;
+            }
+            catch (OperationCanceledException)
+            {
+                return null;
+            }
         }
 
         public async Task InitAsync(PluginInitContext context)