From f893cbf3a11653132a802c57e75488991a312463 Mon Sep 17 00:00:00 2001
From: Michael VanOverbeek <michaelshiftos@gmail.com>
Date: Mon, 1 May 2017 20:09:46 +0000
Subject: Fix user persistence bug

---
 ShiftOS.Objects/Save.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ShiftOS.Objects')

diff --git a/ShiftOS.Objects/Save.cs b/ShiftOS.Objects/Save.cs
index 4f91db7..2a02bbc 100644
--- a/ShiftOS.Objects/Save.cs
+++ b/ShiftOS.Objects/Save.cs
@@ -98,7 +98,7 @@ namespace ShiftOS.Objects
             return count;
         }
 
-        public List<ClientSave> Users = new List<ClientSave>();
+        public List<ClientSave> Users { get; set; }
     }
 
     public class SettingsObject : DynamicObject
-- 
cgit v1.2.3


From 14c5ba260fad4a9751630c5f5fc322bf7963602b Mon Sep 17 00:00:00 2001
From: william341 <wwokwilliam@gmail.com>
Date: Tue, 2 May 2017 17:52:10 -0700
Subject: fix some nres

---
 ShiftOS.Objects/ShiftFS.cs               | 6 +++++-
 ShiftOS.WinForms/Tools/ControlManager.cs | 1 +
 ShiftOS.WinForms/WFLanguageProvider.cs   | 7 -------
 3 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'ShiftOS.Objects')

diff --git a/ShiftOS.Objects/ShiftFS.cs b/ShiftOS.Objects/ShiftFS.cs
index 713bd17..c2121f0 100644
--- a/ShiftOS.Objects/ShiftFS.cs
+++ b/ShiftOS.Objects/ShiftFS.cs
@@ -230,7 +230,11 @@ namespace ShiftOS.Objects.ShiftFS
 
             if (!FileExists(path))
             {
-                dir.AddFile(new File(pathlist[pathlist.Length - 1], Encoding.UTF8.GetBytes(contents), false, Permissions.All));
+                try
+                {
+                    dir.AddFile(new File(pathlist[pathlist.Length - 1], Encoding.UTF8.GetBytes(contents), false, Permissions.All));
+                }
+                catch { }
             }
             else
             {
diff --git a/ShiftOS.WinForms/Tools/ControlManager.cs b/ShiftOS.WinForms/Tools/ControlManager.cs
index 6d60f9d..3d66b2b 100644
--- a/ShiftOS.WinForms/Tools/ControlManager.cs
+++ b/ShiftOS.WinForms/Tools/ControlManager.cs
@@ -154,6 +154,7 @@ namespace ShiftOS.WinForms.Tools
 
                 try
                 {
+                    if(ctrl.Tag != null)
                     tag = ctrl.Tag.ToString();
                 }
                 catch { }
diff --git a/ShiftOS.WinForms/WFLanguageProvider.cs b/ShiftOS.WinForms/WFLanguageProvider.cs
index c11b6dc..2a431f8 100644
--- a/ShiftOS.WinForms/WFLanguageProvider.cs
+++ b/ShiftOS.WinForms/WFLanguageProvider.cs
@@ -44,14 +44,7 @@ namespace ShiftOS.WinForms
         {
             try
             {
-                switch (SaveSystem.CurrentSave.Language)
-                {
-                    case "deutsch":
-                        return Properties.Resources.strings_de;
-                    default:
                         return getDefault();
-
-                }
             }
             catch (NullReferenceException)
             {
-- 
cgit v1.2.3