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.WinForms/Tools/ControlManager.cs | 1 +
 ShiftOS.WinForms/WFLanguageProvider.cs   | 7 -------
 2 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'ShiftOS.WinForms')

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