From e9e234b340353ea6a636a61344938f4202bf6c48 Mon Sep 17 00:00:00 2001 From: goat Date: Fri, 29 Sep 2023 18:53:56 +0200 Subject: [PATCH] fix: actually use the correct path when setting up vfs, fix warnings use paramref instead of see fix warnings --- Dalamud/Interface/Utility/ImGuiClip.cs | 2 +- Dalamud/Logging/ScopedPluginLogService.cs | 4 +++- Dalamud/Storage/ReliableFileStorage.cs | 12 ++++++------ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Dalamud/Interface/Utility/ImGuiClip.cs b/Dalamud/Interface/Utility/ImGuiClip.cs index fafd026f0..c9321fe4c 100644 --- a/Dalamud/Interface/Utility/ImGuiClip.cs +++ b/Dalamud/Interface/Utility/ImGuiClip.cs @@ -60,7 +60,7 @@ public static class ImGuiClip } /// - /// Draws the enumerable data with number of items per line. + /// Draws the enumerable data with number of items per line. /// /// Enumerable containing data to draw. /// The function to draw a single item. diff --git a/Dalamud/Logging/ScopedPluginLogService.cs b/Dalamud/Logging/ScopedPluginLogService.cs index d6bb1f82d..ca96fa64a 100644 --- a/Dalamud/Logging/ScopedPluginLogService.cs +++ b/Dalamud/Logging/ScopedPluginLogService.cs @@ -48,7 +48,9 @@ public class ScopedPluginLogService : IServiceType, IPluginLog, IDisposable set => this.levelSwitch.MinimumLevel = value; } - /// + /// + /// Gets a logger that may be exposed to plugins some day. + /// public ILogger Logger { get; } /// diff --git a/Dalamud/Storage/ReliableFileStorage.cs b/Dalamud/Storage/ReliableFileStorage.cs index fec461cc3..7fdd04880 100644 --- a/Dalamud/Storage/ReliableFileStorage.cs +++ b/Dalamud/Storage/ReliableFileStorage.cs @@ -41,7 +41,7 @@ public class ReliableFileStorage : IServiceType, IDisposable try { - this.SetupDb(vfsDbPath); + this.SetupDb(databasePath); } catch (Exception ex) { @@ -49,15 +49,15 @@ public class ReliableFileStorage : IServiceType, IDisposable try { - if (File.Exists(vfsDbPath)) - File.Delete(vfsDbPath); + if (File.Exists(databasePath)) + File.Delete(databasePath); + + this.SetupDb(databasePath); } catch (Exception) { - // ignored + // ignored, we can run without one } - - this.SetupDb(vfsDbPath); } }