From 9c30a36cd009d3a6ce95f472eaa80d9b6ffe6d60 Mon Sep 17 00:00:00 2001
From: goaaats <16760685+goaaats@users.noreply.github.com>
Date: Fri, 7 Jan 2022 22:03:01 +0100
Subject: [PATCH] fix: safeguard against dalamudConfig.json that serializes to
 null

---
 Dalamud/Configuration/Internal/DalamudConfiguration.cs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/Dalamud/Configuration/Internal/DalamudConfiguration.cs b/Dalamud/Configuration/Internal/DalamudConfiguration.cs
index 05cb48e3c..f7f144f87 100644
--- a/Dalamud/Configuration/Internal/DalamudConfiguration.cs
+++ b/Dalamud/Configuration/Internal/DalamudConfiguration.cs
@@ -87,11 +87,6 @@ namespace Dalamud.Configuration.Internal
         /// </summary>
         public string? DalamudBetaKey { get; set; } = null;
 
-        /// <summary>
-        /// Gets or sets a value indicating whether or not XL should download the Dalamud .NET runtime.
-        /// </summary>
-        public bool DoDalamudRuntime { get; set; } = false;
-
         /// <summary>
         /// Gets or sets a list of custom repos.
         /// </summary>
@@ -252,7 +247,7 @@ namespace Dalamud.Configuration.Internal
         /// <returns>The deserialized configuration file.</returns>
         public static DalamudConfiguration Load(string path)
         {
-            DalamudConfiguration deserialized;
+            DalamudConfiguration deserialized = null;
             try
             {
                 deserialized = JsonConvert.DeserializeObject<DalamudConfiguration>(File.ReadAllText(path), SerializerSettings);
@@ -260,9 +255,9 @@ namespace Dalamud.Configuration.Internal
             catch (Exception ex)
             {
                 Log.Warning(ex, "Failed to load DalamudConfiguration at {0}", path);
-                deserialized = new DalamudConfiguration();
             }
 
+            deserialized ??= new DalamudConfiguration();
             deserialized.configPath = path;
 
             return deserialized;