From cdd426b03caf9c8f2bde7ddb6bdfbea67b73cabd Mon Sep 17 00:00:00 2001 From: Andrei Tudor Date: Mon, 3 Jun 2024 19:52:39 +0300 Subject: [PATCH] Fixed bug where bot crashes if the config is empty --- DiscordBotCore/Application.cs | 2 +- DiscordBotCore/Others/SettingsDictionary.cs | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/DiscordBotCore/Application.cs b/DiscordBotCore/Application.cs index 78a00a3..fe484be 100644 --- a/DiscordBotCore/Application.cs +++ b/DiscordBotCore/Application.cs @@ -28,7 +28,7 @@ namespace DiscordBotCore private static readonly string _MaxParallelDownloads = "3"; public string ServerID => ApplicationEnvironmentVariables["ServerID"]; - public string PluginDatabase => ApplicationEnvironmentVariables["PluginDatabase"]; + public string PluginDatabase => ApplicationEnvironmentVariables["PluginDatabase"] ?? _PluginsDatabaseFile; public string LogFile => $"{ApplicationEnvironmentVariables["LogFolder"]}/{DateTime.Now.ToLongDateString().Replace(" / ", "")}.log"; public string DataFolder => _ResourcesFolder; diff --git a/DiscordBotCore/Others/SettingsDictionary.cs b/DiscordBotCore/Others/SettingsDictionary.cs index 2e6356d..7f42c28 100644 --- a/DiscordBotCore/Others/SettingsDictionary.cs +++ b/DiscordBotCore/Others/SettingsDictionary.cs @@ -36,18 +36,22 @@ public class SettingsDictionary { _Dictionary = new Dictionary(); await SaveToFile(); - return true; + return false; } string fileAsText = await File.ReadAllTextAsync(_File); if(string.IsNullOrEmpty(fileAsText) || string.IsNullOrWhiteSpace(fileAsText)) { _Dictionary = new Dictionary(); + await SaveToFile(); return false; } _Dictionary = await JsonManager.ConvertFromJson>(fileAsText); + if (_Dictionary.Keys.Count == 0) + return false; + return true; }