From 0b33c0ba7222ca882f25de42aa1461199791149e Mon Sep 17 00:00:00 2001
From: bree <kaleidonkep99@outlook.com>
Date: Fri, 28 Feb 2025 04:08:05 +0100
Subject: [PATCH] Fixed aggressive trimming, causing JSON file to not load when
 adding a SoundFont to the list

---
 OmniConverter/Extensions/SoundFonts.cs |  1 +
 OmniConverter/OmniConverter.csproj     |  2 +-
 OmniConverter/Program.cs               | 10 ++++++----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/OmniConverter/Extensions/SoundFonts.cs b/OmniConverter/Extensions/SoundFonts.cs
index 99a55d3..7885c24 100644
--- a/OmniConverter/Extensions/SoundFonts.cs
+++ b/OmniConverter/Extensions/SoundFonts.cs
@@ -47,6 +47,7 @@ public class SoundFont : INotifyPropertyChanged
         [JsonProperty]
         public bool NoRampIn { get; private set; }
 
+        [JsonIgnore]
         public string SoundFontDisplayName => $"{(Enabled ? "" : "[OFF] ")}{SoundFontPath}";
 
         public SoundFont()
diff --git a/OmniConverter/OmniConverter.csproj b/OmniConverter/OmniConverter.csproj
index 270cd1a..924cae3 100644
--- a/OmniConverter/OmniConverter.csproj
+++ b/OmniConverter/OmniConverter.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <PublishSingleFile>true</PublishSingleFile> 
 	  <PublishTrimmed>true</PublishTrimmed>
-	  <TrimMode>link</TrimMode>
+	  <TrimMode>partial</TrimMode>
     <OutputType>WinExe</OutputType>
     <Nullable>enable</Nullable>
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
diff --git a/OmniConverter/Program.cs b/OmniConverter/Program.cs
index e8cec1d..3d81ce6 100644
--- a/OmniConverter/Program.cs
+++ b/OmniConverter/Program.cs
@@ -13,8 +13,9 @@ namespace OmniConverter
     internal class Program
     {
         public static readonly string tempConvFile = "omniconv.temp";
-        public static readonly string tempConvFilePath = AppContext.BaseDirectory + $"/{tempConvFile}";
-        private static readonly string settingsPath = AppContext.BaseDirectory + "/settings.json";
+        public static readonly string tempConvFilePath = $"{AppDomain.CurrentDomain.BaseDirectory}/{tempConvFile}";
+        private static readonly string settingsPath = $"{AppDomain.CurrentDomain.BaseDirectory}/settings.json";
+
         public static Settings Settings { get; private set; } = new();
         public static SoundFonts SoundFontsManager { get; private set; } = new();
         public static bool FFmpegAvailable { get; private set; } = false;
@@ -111,7 +112,7 @@ public static void LoadConfig(bool startup = false)
                 using (StreamReader sr = new(settingsPath))
                     settingsJSON = sr.ReadToEnd();
 
-                var jsonSettings = new JsonSerializerSettings { MissingMemberHandling = MissingMemberHandling.Ignore };
+                var jsonSettings = new JsonSerializerSettings { MissingMemberHandling = MissingMemberHandling.Ignore, NullValueHandling = NullValueHandling.Ignore };
                 var userSettings = JsonConvert.DeserializeObject<Settings?>(settingsJSON, jsonSettings);
 
                 if (userSettings == null)
@@ -122,8 +123,9 @@ public static void LoadConfig(bool startup = false)
 
                 Settings = userSettings;
             }
-            catch
+            catch (Exception ex)
             {
+                Debug.PrintToConsole(Debug.LogType.Warning, $"Something went wrong while opening the file! {ex.Message}");
                 CreateConfig(startup);
             }
             finally