diff options
| author | Michael <[email protected]> | 2017-01-08 09:57:10 -0500 |
|---|---|---|
| committer | Michael <[email protected]> | 2017-01-08 09:57:10 -0500 |
| commit | f30dcf5ef41d54c588d7b42c48be8d941abba72e (patch) | |
| tree | 7705f99b965673b1c034ac2b1c56e65072c827df /ShiftOS.WinForms/Applications/Terminal.cs.rej | |
| parent | 69dfad54724d4176dfce238a8d7e73970e6eef24 (diff) | |
| download | shiftos_thereturn-f30dcf5ef41d54c588d7b42c48be8d941abba72e.tar.gz shiftos_thereturn-f30dcf5ef41d54c588d7b42c48be8d941abba72e.tar.bz2 shiftos_thereturn-f30dcf5ef41d54c588d7b42c48be8d941abba72e.zip | |
Initial upload
Diffstat (limited to 'ShiftOS.WinForms/Applications/Terminal.cs.rej')
| -rw-r--r-- | ShiftOS.WinForms/Applications/Terminal.cs.rej | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/ShiftOS.WinForms/Applications/Terminal.cs.rej b/ShiftOS.WinForms/Applications/Terminal.cs.rej new file mode 100644 index 0000000..8f0aed5 --- /dev/null +++ b/ShiftOS.WinForms/Applications/Terminal.cs.rej @@ -0,0 +1,12 @@ +diff a/ShiftOS_TheReturn/Applications/Terminal.cs b/ShiftOS_TheReturn/Applications/Terminal.cs (rejected hunks) +@@ -228,6 +228,10 @@ + string args = text.Substring(argStart, text.Length - argStart); + text = text.Remove(argStart, text.Length - argStart).Replace(" ", ""); + ++ if(string.IsNullOrWhiteSpace(args)) ++ { ++ return new Dictionary<string, object>(); ++ } + return JsonConvert.DeserializeObject<Dictionary<string, object>>(args); + } + |