Skip to content

Commit 1f1b319

Browse files
committed
Improve argument name to avoid possible confusion
1 parent 7598a6a commit 1f1b319

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Flow.Launcher.Core/Plugin/PluginManager.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ public static bool PluginModified(string uuid)
440440
public static void UpdatePlugin(PluginMetadata existingVersion, UserPlugin newVersion, string zipFilePath)
441441
{
442442
InstallPlugin(newVersion, zipFilePath, checkModified:false);
443-
UninstallPlugin(existingVersion, removeSettings:false, removePluginSettings:false, checkModified: false);
443+
UninstallPlugin(existingVersion, removePluginFromSettings:false, removePluginSettings:false, checkModified: false);
444444
_modifiedPlugins.Add(existingVersion.ID);
445445
}
446446

@@ -455,9 +455,9 @@ public static void InstallPlugin(UserPlugin plugin, string zipFilePath)
455455
/// <summary>
456456
/// Uninstall a plugin.
457457
/// </summary>
458-
public static void UninstallPlugin(PluginMetadata plugin, bool removeSettings = true, bool removePluginSettings = false)
458+
public static void UninstallPlugin(PluginMetadata plugin, bool removePluginFromSettings = true, bool removePluginSettings = false)
459459
{
460-
UninstallPlugin(plugin, removeSettings, removePluginSettings, true);
460+
UninstallPlugin(plugin, removePluginFromSettings, removePluginSettings, true);
461461
}
462462

463463
#endregion
@@ -530,14 +530,14 @@ internal static void InstallPlugin(UserPlugin plugin, string zipFilePath, bool c
530530
}
531531
}
532532

533-
internal static void UninstallPlugin(PluginMetadata plugin, bool removeSettings, bool removePluginSettings, bool checkModified)
533+
internal static void UninstallPlugin(PluginMetadata plugin, bool removePluginFromSettings, bool removePluginSettings, bool checkModified)
534534
{
535535
if (checkModified && PluginModified(plugin.ID))
536536
{
537537
throw new ArgumentException($"Plugin {plugin.Name} has been modified");
538538
}
539539

540-
if (removeSettings)
540+
if (removePluginFromSettings)
541541
{
542542
Settings.Plugins.Remove(plugin.ID);
543543
AllPlugins.RemoveAll(p => p.Metadata.ID == plugin.ID);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ private void Uninstall(PluginMetadata plugin)
686686
Context.API.GetTranslation("plugin_pluginsmanager_keep_plugin_settings_subtitle"),
687687
Context.API.GetTranslation("plugin_pluginsmanager_keep_plugin_settings_title"),
688688
button: MessageBoxButton.YesNo) == MessageBoxResult.No;
689-
PluginManager.UninstallPlugin(plugin, removeSettings: true, removePluginSettings: removePluginSettings);
689+
PluginManager.UninstallPlugin(plugin, removePluginFromSettings: true, removePluginSettings: removePluginSettings);
690690
}
691691
catch (ArgumentException e)
692692
{

0 commit comments

Comments
 (0)