aboutsummaryrefslogtreecommitdiff
path: root/ShiftOS.WinForms
diff options
context:
space:
mode:
authorwilliam341 <[email protected]>2017-05-02 17:52:10 -0700
committerwilliam341 <[email protected]>2017-05-02 17:52:10 -0700
commit14c5ba260fad4a9751630c5f5fc322bf7963602b (patch)
treec6170e2d3b6e540da4f508ed1c98297d6ab3eaec /ShiftOS.WinForms
parent596db1d5bc7033c9624390c6c2967c161aaf969a (diff)
downloadshiftos_thereturn-14c5ba260fad4a9751630c5f5fc322bf7963602b.tar.gz
shiftos_thereturn-14c5ba260fad4a9751630c5f5fc322bf7963602b.tar.bz2
shiftos_thereturn-14c5ba260fad4a9751630c5f5fc322bf7963602b.zip
fix some nres
Diffstat (limited to 'ShiftOS.WinForms')
-rw-r--r--ShiftOS.WinForms/Tools/ControlManager.cs1
-rw-r--r--ShiftOS.WinForms/WFLanguageProvider.cs7
2 files changed, 1 insertions, 7 deletions
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)
{