From 69ef3ba644cf3e15dbee32994a6f640294bc54b0 Mon Sep 17 00:00:00 2001
From: Michael VanOverbeek <michaelshiftos@gmail.com>
Date: Mon, 27 Feb 2017 21:19:31 +0000
Subject: Chat logging.

---
 ShiftOS.Server/ShopBackend.cs | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'ShiftOS.Server/ShopBackend.cs')

diff --git a/ShiftOS.Server/ShopBackend.cs b/ShiftOS.Server/ShopBackend.cs
index 12f69ce..baf1e7a 100644
--- a/ShiftOS.Server/ShopBackend.cs
+++ b/ShiftOS.Server/ShopBackend.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * MIT License
  * 
  * Copyright (c) 2017 Michael VanOverbeek and ShiftOS devs
@@ -185,15 +185,18 @@ namespace ShiftOS.Server
             if (File.Exists("shops.json"))
                 foreach (var shop in JsonConvert.DeserializeObject<List<Shop>>(File.ReadAllText("shops.json")))
                 {
-                    if (shop.Owner == shopOwner)
+                    if (shop != null)
                     {
-                        server.DispatchTo(new Guid(guid), new NetObject("ruecuodaL", new ServerMessage
+                        if (shop.Owner == shopOwner)
                         {
-                            Name = "user_shop",
-                            GUID = "server",
-                            Contents = JsonConvert.SerializeObject(shop)
-                        }));
-                        return;
+                            server.DispatchTo(new Guid(guid), new NetObject("ruecuodaL", new ServerMessage
+                            {
+                                Name = "user_shop",
+                                GUID = "server",
+                                Contents = JsonConvert.SerializeObject(shop)
+                            }));
+                            return;
+                        }
                     }
                 }
 
-- 
cgit v1.2.3