From fa19d3da146e646b514c7a9b28cf121949d05ad4 Mon Sep 17 00:00:00 2001 From: glax Date: Mon, 31 Jul 2023 00:01:18 +0200 Subject: [PATCH] Fix missing file on loading settings/commonobjects --- Tranga/CommonObjects.cs | 15 +++++++++++---- Tranga/TrangaSettings.cs | 15 +++++++++++---- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/Tranga/CommonObjects.cs b/Tranga/CommonObjects.cs index c4f12bd..a97e117 100644 --- a/Tranga/CommonObjects.cs +++ b/Tranga/CommonObjects.cs @@ -53,6 +53,7 @@ public class CommonObjects public void ExportSettings() { + TrangaSettings.SettingsJsonObject? settings = null; if (File.Exists(settingsFilePath)) { bool inUse = true; @@ -70,11 +71,17 @@ public class CommonObjects Thread.Sleep(50); } } + string toRead = File.ReadAllText(settingsFilePath); + settings = JsonConvert.DeserializeObject(toRead, + new JsonSerializerSettings + { + Converters = + { + new NotificationManager.NotificationManagerJsonConverter(), + new LibraryManager.LibraryManagerJsonConverter() + } + }); } - - string toRead = File.ReadAllText(settingsFilePath); - TrangaSettings.SettingsJsonObject? settings = JsonConvert.DeserializeObject(toRead, - new JsonSerializerSettings { Converters = { new NotificationManager.NotificationManagerJsonConverter(), new LibraryManager.LibraryManagerJsonConverter() } }); settings = new TrangaSettings.SettingsJsonObject(settings?.ts, this); File.WriteAllText(settingsFilePath, JsonConvert.SerializeObject(settings)); } diff --git a/Tranga/TrangaSettings.cs b/Tranga/TrangaSettings.cs index ae1d835..1a20d78 100644 --- a/Tranga/TrangaSettings.cs +++ b/Tranga/TrangaSettings.cs @@ -37,6 +37,7 @@ public class TrangaSettings public void ExportSettings() { + SettingsJsonObject? settings = null; if (File.Exists(settingsFilePath)) { bool inUse = true; @@ -54,11 +55,17 @@ public class TrangaSettings Thread.Sleep(50); } } + string toRead = File.ReadAllText(settingsFilePath); + settings = JsonConvert.DeserializeObject(toRead, + new JsonSerializerSettings + { + Converters = + { + new NotificationManager.NotificationManagerJsonConverter(), + new LibraryManager.LibraryManagerJsonConverter() + } + }); } - - string toRead = File.ReadAllText(settingsFilePath); - SettingsJsonObject? settings = JsonConvert.DeserializeObject(toRead, - new JsonSerializerSettings { Converters = { new NotificationManager.NotificationManagerJsonConverter(), new LibraryManager.LibraryManagerJsonConverter() } }); settings = new SettingsJsonObject(this, settings?.co); File.WriteAllText(settingsFilePath, JsonConvert.SerializeObject(settings)); }