diff options
| author | AShifter <[email protected]> | 2017-05-02 19:43:15 -0600 |
|---|---|---|
| committer | AShifter <[email protected]> | 2017-05-02 19:43:15 -0600 |
| commit | b06801028acc3b3da80ef5077abe8f0baaa82dac (patch) | |
| tree | 5c65cccdd17f8d89125841663749cbaf970ed52a /ShiftOS.Objects | |
| parent | bbb21a1b32ff2642eb3f9804ef653e57a8be7e41 (diff) | |
| parent | 8381c825b1c6d4d47af23e9461ece4f4a1f88cc5 (diff) | |
| download | shiftos_thereturn-b06801028acc3b3da80ef5077abe8f0baaa82dac.tar.gz shiftos_thereturn-b06801028acc3b3da80ef5077abe8f0baaa82dac.tar.bz2 shiftos_thereturn-b06801028acc3b3da80ef5077abe8f0baaa82dac.zip | |
Merge remote-tracking branch 'refs/remotes/shiftos-game/master'
Diffstat (limited to 'ShiftOS.Objects')
| -rw-r--r-- | ShiftOS.Objects/Save.cs | 2 | ||||
| -rw-r--r-- | ShiftOS.Objects/ShiftFS.cs | 6 |
2 files changed, 6 insertions, 2 deletions
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 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 { |