From cc0fb66b2245dbc1e7f4098b5da492b19a8868ac Mon Sep 17 00:00:00 2001 From: Jack251970 <1160210343@qq.com> Date: Mon, 6 Jan 2025 21:26:05 +0800 Subject: [PATCH] Extract duplicate cleanup code into a method --- .../PluginsManager.cs | 32 +++++++------------ 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs index bbb5c179e..a41a82c67 100644 --- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs +++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs @@ -196,11 +196,7 @@ namespace Flow.Launcher.Plugin.PluginsManager if (downloadCancelled) return; else - Application.Current.Dispatcher.Invoke(() => - { - prgBox.Close(); - prgBox = null; - }); + CleanupProgressBoxEx(prgBox); } else { @@ -221,14 +217,7 @@ namespace Flow.Launcher.Plugin.PluginsManager catch (HttpRequestException e) { // force close progress box - Application.Current.Dispatcher.Invoke(() => - { - if (prgBox != null) - { - prgBox.Close(); - prgBox = null; - } - }); + CleanupProgressBoxEx(prgBox); // show error message Context.API.ShowMsgError( @@ -241,14 +230,7 @@ namespace Flow.Launcher.Plugin.PluginsManager catch (Exception e) { // force close progress box - Application.Current.Dispatcher.Invoke(() => - { - if (prgBox != null) - { - prgBox.Close(); - prgBox = null; - } - }); + CleanupProgressBoxEx(prgBox); // show error message Context.API.ShowMsgError(Context.API.GetTranslation("plugin_pluginsmanager_install_error_title"), @@ -274,6 +256,14 @@ namespace Flow.Launcher.Plugin.PluginsManager } } + private static void CleanupProgressBoxEx(IProgressBoxEx prgBox) + { + Application.Current.Dispatcher.Invoke(() => + { + prgBox?.Close(); + }); + } + internal async ValueTask> RequestUpdateAsync(string search, CancellationToken token, bool usePrimaryUrlOnly = false) {