From 73bb52d1b525390871c08067b0a860967202cf08 Mon Sep 17 00:00:00 2001
From: Poliwrath <Poliwrath@users.noreply.github.com>
Date: Mon, 27 Jul 2020 02:45:02 -0400
Subject: [PATCH] catch exception if loading DalamudConfiguration fails

---
 Dalamud/Configuration/DalamudConfiguration.cs | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/Dalamud/Configuration/DalamudConfiguration.cs b/Dalamud/Configuration/DalamudConfiguration.cs
index b7296344c..5e52d5c7e 100644
--- a/Dalamud/Configuration/DalamudConfiguration.cs
+++ b/Dalamud/Configuration/DalamudConfiguration.cs
@@ -5,6 +5,7 @@ using Dalamud.Configuration;
 using Dalamud.DiscordBot;
 using Dalamud.Game.Chat;
 using Newtonsoft.Json;
+using Serilog;
 
 namespace Dalamud
 {
@@ -43,7 +44,17 @@ namespace Dalamud
         public string ConfigPath;
 
         public static DalamudConfiguration Load(string path) {
-            var deserialized = JsonConvert.DeserializeObject<DalamudConfiguration>(File.ReadAllText(path));
+            DalamudConfiguration deserialized;
+            try
+            {
+                deserialized = JsonConvert.DeserializeObject<DalamudConfiguration>(File.ReadAllText(path));
+            }
+            catch (Exception ex)
+            {
+                Log.Warning(ex, "Failed to load DalamudConfiguration at {0}", path);
+                deserialized = new DalamudConfiguration();
+            }
+
             deserialized.ConfigPath = path;
 
             return deserialized;