Skip to content

Commit 486cc6a

Browse files
committed
Fix async task issue
1 parent ce3a3e9 commit 486cc6a

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

Flow.Launcher.Core/Plugin/PluginManager.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -469,10 +469,10 @@ public static bool PluginModified(string uuid)
469469
/// Update a plugin to new version, from a zip file. By default will remove the zip file if update is via url,
470470
/// unless it's a local path installation
471471
/// </summary>
472-
public static void UpdatePlugin(PluginMetadata existingVersion, UserPlugin newVersion, string zipFilePath)
472+
public static async Task UpdatePluginAsync(PluginMetadata existingVersion, UserPlugin newVersion, string zipFilePath)
473473
{
474474
InstallPlugin(newVersion, zipFilePath, checkModified:false);
475-
UninstallPlugin(existingVersion, removePluginFromSettings:false, removePluginSettings:false, checkModified: false);
475+
await UninstallPluginAsync(existingVersion, removePluginFromSettings:false, removePluginSettings:false, checkModified: false);
476476
_modifiedPlugins.Add(existingVersion.ID);
477477
}
478478

@@ -487,9 +487,9 @@ public static void InstallPlugin(UserPlugin plugin, string zipFilePath)
487487
/// <summary>
488488
/// Uninstall a plugin.
489489
/// </summary>
490-
public static void UninstallPlugin(PluginMetadata plugin, bool removePluginFromSettings = true, bool removePluginSettings = false)
490+
public static async Task UninstallPluginAsync(PluginMetadata plugin, bool removePluginFromSettings = true, bool removePluginSettings = false)
491491
{
492-
UninstallPlugin(plugin, removePluginFromSettings, removePluginSettings, true);
492+
await UninstallPluginAsync(plugin, removePluginFromSettings, removePluginSettings, true);
493493
}
494494

495495
#endregion
@@ -570,7 +570,7 @@ internal static void InstallPlugin(UserPlugin plugin, string zipFilePath, bool c
570570
}
571571
}
572572

573-
internal static async void UninstallPlugin(PluginMetadata plugin, bool removePluginFromSettings, bool removePluginSettings, bool checkModified)
573+
internal static async Task UninstallPluginAsync(PluginMetadata plugin, bool removePluginFromSettings, bool removePluginSettings, bool checkModified)
574574
{
575575
if (checkModified && PluginModified(plugin.ID))
576576
{

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ await DownloadFileAsync(
341341
}
342342
else
343343
{
344-
PluginManager.UpdatePlugin(x.PluginExistingMetadata, x.PluginNewUserPlugin,
344+
await PluginManager.UpdatePluginAsync(x.PluginExistingMetadata, x.PluginNewUserPlugin,
345345
downloadToFilePath);
346346

347347
if (Settings.AutoRestartAfterChanging)
@@ -433,7 +433,7 @@ await DownloadFileAsync(
433433
if (cts.IsCancellationRequested)
434434
return;
435435
else
436-
PluginManager.UpdatePlugin(plugin.PluginExistingMetadata, plugin.PluginNewUserPlugin,
436+
await PluginManager.UpdatePluginAsync(plugin.PluginExistingMetadata, plugin.PluginNewUserPlugin,
437437
downloadToFilePath);
438438
}
439439
catch (Exception ex)
@@ -681,7 +681,7 @@ internal List<Result> RequestUninstall(string search)
681681
Title = $"{x.Metadata.Name} by {x.Metadata.Author}",
682682
SubTitle = x.Metadata.Description,
683683
IcoPath = x.Metadata.IcoPath,
684-
Action = e =>
684+
AsyncAction = async e =>
685685
{
686686
string message;
687687
if (Settings.AutoRestartAfterChanging)
@@ -704,7 +704,7 @@ internal List<Result> RequestUninstall(string search)
704704
MessageBoxButton.YesNo) == MessageBoxResult.Yes)
705705
{
706706
Context.API.HideMainWindow();
707-
Uninstall(x.Metadata);
707+
await UninstallAsync(x.Metadata);
708708
if (Settings.AutoRestartAfterChanging)
709709
{
710710
Context.API.RestartApp();
@@ -729,15 +729,15 @@ internal List<Result> RequestUninstall(string search)
729729
return Search(results, search);
730730
}
731731

732-
private void Uninstall(PluginMetadata plugin)
732+
private async Task UninstallAsync(PluginMetadata plugin)
733733
{
734734
try
735735
{
736736
var removePluginSettings = Context.API.ShowMsgBox(
737737
Context.API.GetTranslation("plugin_pluginsmanager_keep_plugin_settings_subtitle"),
738738
Context.API.GetTranslation("plugin_pluginsmanager_keep_plugin_settings_title"),
739739
button: MessageBoxButton.YesNo) == MessageBoxResult.No;
740-
PluginManager.UninstallPlugin(plugin, removePluginFromSettings: true, removePluginSettings: removePluginSettings);
740+
await PluginManager.UninstallPluginAsync(plugin, removePluginFromSettings: true, removePluginSettings: removePluginSettings);
741741
}
742742
catch (ArgumentException e)
743743
{

0 commit comments

Comments
 (0)