From cfb2ca117186cb0d10f96bcac242ba35c7cc5148 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Tue, 27 Jul 2021 20:32:53 +1000 Subject: [PATCH 1/2] fix PluginsManager context menu crashing --- .../Flow.Launcher.Plugin.PluginsManager/ContextMenu.cs | 3 +++ .../Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs | 8 +++++++- Plugins/Flow.Launcher.Plugin.PluginsManager/plugin.json | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/ContextMenu.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/ContextMenu.cs index 90ce19db4..12989a603 100644 --- a/Plugins/Flow.Launcher.Plugin.PluginsManager/ContextMenu.cs +++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/ContextMenu.cs @@ -19,6 +19,9 @@ namespace Flow.Launcher.Plugin.PluginsManager { var pluginManifestInfo = selectedResult.ContextData as UserPlugin; + if (pluginManifestInfo == null) + return new List(); + return new List { new Result diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs index 1aa39469b..995ac0fed 100644 --- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs +++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs @@ -269,7 +269,13 @@ namespace Flow.Launcher.Plugin.PluginsManager } return false; - } + }, + ContextData = + new UserPlugin + { + Website = x.PluginNewUserPlugin.Website, + UrlSourceCode = x.PluginNewUserPlugin.UrlSourceCode + } }); return Search(results, uninstallSearch); diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/plugin.json b/Plugins/Flow.Launcher.Plugin.PluginsManager/plugin.json index 255546686..fa916a29d 100644 --- a/Plugins/Flow.Launcher.Plugin.PluginsManager/plugin.json +++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/plugin.json @@ -6,7 +6,7 @@ "Name": "Plugins Manager", "Description": "Management of installing, uninstalling or updating Flow Launcher plugins", "Author": "Jeremy Wu", - "Version": "1.8.3", + "Version": "1.8.4", "Language": "csharp", "Website": "https://github.com/Flow-Launcher/Flow.Launcher", "ExecuteFileName": "Flow.Launcher.Plugin.PluginsManager.dll", From 2155602a9cf9f46977983113e876e335f0e43cc0 Mon Sep 17 00:00:00 2001 From: Jeremy Wu Date: Tue, 27 Jul 2021 21:20:37 +1000 Subject: [PATCH 2/2] update per suggestion Co-authored-by: Kevin Zhang <45326534+taooceros@users.noreply.github.com> --- Plugins/Flow.Launcher.Plugin.PluginsManager/ContextMenu.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/ContextMenu.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/ContextMenu.cs index 12989a603..364216778 100644 --- a/Plugins/Flow.Launcher.Plugin.PluginsManager/ContextMenu.cs +++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/ContextMenu.cs @@ -17,9 +17,7 @@ namespace Flow.Launcher.Plugin.PluginsManager public List LoadContextMenus(Result selectedResult) { - var pluginManifestInfo = selectedResult.ContextData as UserPlugin; - - if (pluginManifestInfo == null) + if(selectedResult.ContextData is not UserPlugin pluginManifestInfo) return new List(); return new List