Skip to content

Commit eac5c4c

Browse files
committed
update per comment
1 parent e0466f8 commit eac5c4c

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

Flow.Launcher.Infrastructure/UserSettings/DataLocation.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ public static bool PortableDataLocationInUse()
3030
}
3131

3232
public static readonly string PluginsDirectory = Path.Combine(DataDirectory(), Constant.Plugins);
33-
public static readonly string SettingsDirectory = Path.Combine(DataDirectory(), "Settings");
34-
public static readonly string PluginSettingsDirectory = Path.Combine(SettingsDirectory, Constant.Plugins);
33+
public static readonly string PluginSettingsDirectory = Path.Combine(DataDirectory(), "Settings", Constant.Plugins);
3534
}
3635
}

Plugins/Flow.Launcher.Plugin.WebSearch/Main.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,11 +174,14 @@ public void Init(PluginInitContext context)
174174
_context = context;
175175
var pluginDirectory = _context.CurrentPluginMetadata.PluginDirectory;
176176
var bundledImagesDirectory = Path.Combine(pluginDirectory, Images);
177+
178+
// Default images directory is in the WebSearch's application folder
177179
DefaultImagesDirectory = Path.Combine(_context.CurrentPluginMetadata.PluginDirectory, Images);
178180
Helper.ValidateDataDirectory(bundledImagesDirectory, DefaultImagesDirectory);
179181

182+
// Custom images directory is in the WebSearch's data location folder
180183
var name = Path.GetFileNameWithoutExtension(_context.CurrentPluginMetadata.ExecuteFileName);
181-
CustomImagesDirectory = Path.Combine(DataLocation.PluginSettingsDirectory, $"{name}\\CustomIcons");
184+
CustomImagesDirectory = Path.Combine(DataLocation.PluginSettingsDirectory, name, "CustomIcons");
182185
}
183186

184187
#region ISettingProvider Members

0 commit comments

Comments
 (0)