From ff47625d2547deed441a853569f9fe84197e23b6 Mon Sep 17 00:00:00 2001
From: Michael <Michael@some.where>
Date: Mon, 29 May 2017 16:08:59 -0400
Subject: fix some clientside save softlocks

---
 ShiftOS_TheReturn/SaveSystem.cs | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'ShiftOS_TheReturn')

diff --git a/ShiftOS_TheReturn/SaveSystem.cs b/ShiftOS_TheReturn/SaveSystem.cs
index c8996d4..d1b92fd 100644
--- a/ShiftOS_TheReturn/SaveSystem.cs
+++ b/ShiftOS_TheReturn/SaveSystem.cs
@@ -214,13 +214,22 @@ namespace ShiftOS.Engine
 
             savehandshake = (msg) =>
             {
-                ServerManager.MessageReceived -= savehandshake;
                 if (msg.Name == "mud_savefile")
                 {
-                    CurrentSave = JsonConvert.DeserializeObject<Save>(msg.Contents);
-                }
+                    ServerManager.MessageReceived -= savehandshake;
+                    try
+                    {
+                        CurrentSave = JsonConvert.DeserializeObject<Save>(msg.Contents);
+                    }
+                    catch
+                    {
+                        Console.WriteLine("[system] [SEVERE] Cannot parse configuration file.");
+                        oobe.PromptForLogin();
+                    }
+                    }
                 else if (msg.Name == "mud_login_denied")
                 {
+                    ServerManager.MessageReceived -= savehandshake;
                     oobe.PromptForLogin();
                 }
             };
-- 
cgit v1.2.3