Merge pull request #143 from yairp03/settings-dir-fix

Fix AppSettings directory location empty
yairp03 · May 8, 2023 · f5baf03 · f5baf03
2 parents c1de330 + 8946f9e
commit f5baf03
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/HoradotTV.Console/AppSettings.cs b/HoradotTV.Console/AppSettings.cs
@@ -4,13 +4,13 @@ public class AppSettings
 {
     [JsonIgnore] public static AppSettings Default { get; } = LoadSettings();
 
-    public string? LastPath { get; set; }
+    public string? LastPath { get; set; } = string.Empty;
     public Dictionary<string, (string username, string password)> Credentials { get; init; } = new();
     public bool ForceDownload { get; set; }
 
     private static AppSettings LoadSettings()
     {
-        string path = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!,
+        string path = Path.Combine(Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory)!,
             Constants.SettingsFileName);
 
         if (File.Exists(path))
@@ -24,7 +24,7 @@ private static AppSettings LoadSettings()
 
     public async Task SaveAsync()
     {
-        string path = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!,
+        string path = Path.Combine(Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory)!,
             Constants.SettingsFileName);
         await File.WriteAllTextAsync(path,
             JsonSerializer.Serialize(this, new JsonSerializerOptions { WriteIndented = true, IncludeFields = true }));