diff options
| author | william341 <[email protected]> | 2017-05-02 17:52:10 -0700 |
|---|---|---|
| committer | william341 <[email protected]> | 2017-05-02 17:52:10 -0700 |
| commit | 14c5ba260fad4a9751630c5f5fc322bf7963602b (patch) | |
| tree | c6170e2d3b6e540da4f508ed1c98297d6ab3eaec | |
| parent | 596db1d5bc7033c9624390c6c2967c161aaf969a (diff) | |
| download | shiftos_thereturn-14c5ba260fad4a9751630c5f5fc322bf7963602b.tar.gz shiftos_thereturn-14c5ba260fad4a9751630c5f5fc322bf7963602b.tar.bz2 shiftos_thereturn-14c5ba260fad4a9751630c5f5fc322bf7963602b.zip | |
fix some nres
| -rw-r--r-- | ShiftOS.Objects/ShiftFS.cs | 6 | ||||
| -rw-r--r-- | ShiftOS.WinForms/Tools/ControlManager.cs | 1 | ||||
| -rw-r--r-- | ShiftOS.WinForms/WFLanguageProvider.cs | 7 |
3 files changed, 6 insertions, 8 deletions
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) { |