From 7532df70757ecbcaf735a5fc50eee282f555741a Mon Sep 17 00:00:00 2001
From: Michael <Michael@some.where>
Date: Mon, 1 May 2017 15:23:46 -0400
Subject: Replace most instances of "CurrentSave.Username"

---
 ShiftOS.WinForms/Applications/Dialog.cs   |  2 --
 ShiftOS.WinForms/Applications/Terminal.cs | 12 ++++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'ShiftOS.WinForms/Applications')

diff --git a/ShiftOS.WinForms/Applications/Dialog.cs b/ShiftOS.WinForms/Applications/Dialog.cs
index 2abc705..f9d0b86 100644
--- a/ShiftOS.WinForms/Applications/Dialog.cs
+++ b/ShiftOS.WinForms/Applications/Dialog.cs
@@ -85,8 +85,6 @@ namespace ShiftOS.WinForms.Applications
 
         }
 
-        private Action OpenCallback = null;
-
         public void Open(string title, string msg, Action c = null)
         {
             new Dialog().OpenInternal(title, msg, c);
diff --git a/ShiftOS.WinForms/Applications/Terminal.cs b/ShiftOS.WinForms/Applications/Terminal.cs
index d35f7e0..32c5363 100644
--- a/ShiftOS.WinForms/Applications/Terminal.cs
+++ b/ShiftOS.WinForms/Applications/Terminal.cs
@@ -197,7 +197,7 @@ namespace ShiftOS.WinForms.Applications
 
         public void ResetAllKeywords()
         {
-            string primary = SaveSystem.CurrentSave.Username + " ";
+            string primary = SaveSystem.CurrentUser.Username + " ";
             string secondary = "shiftos ";
 
 
@@ -279,7 +279,7 @@ namespace ShiftOS.WinForms.Applications
                         {
                             if (TerminalBackend.PrefixEnabled)
                             {
-                                text3 = text4.Remove(0, $"{SaveSystem.CurrentSave.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ".Length);
+                                text3 = text4.Remove(0, $"{SaveSystem.CurrentUser.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ".Length);
                             }
                             TerminalBackend.LastCommand = text3;
                             TextSent?.Invoke(text4);
@@ -327,7 +327,7 @@ namespace ShiftOS.WinForms.Applications
                     {
                         var tostring3 = txt.Lines[txt.Lines.Length - 1];
                         var tostringlen = tostring3.Length + 1;
-                        var workaround = $"{SaveSystem.CurrentSave.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ";
+                        var workaround = $"{SaveSystem.CurrentUser.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ";
                         var derp = workaround.Length + 1;
                         if (tostringlen != derp)
                         {
@@ -347,7 +347,7 @@ namespace ShiftOS.WinForms.Applications
                 {
                     var getstring = txt.Lines[txt.Lines.Length - 1];
                     var stringlen = getstring.Length + 1;
-                    var header = $"{SaveSystem.CurrentSave.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ";
+                    var header = $"{SaveSystem.CurrentUser.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ";
                     var headerlen = header.Length + 1;
                     var selstart = txt.SelectionStart;
                     var remstrlen = txt.TextLength - stringlen;
@@ -365,7 +365,7 @@ namespace ShiftOS.WinForms.Applications
                 else if (a.KeyCode == Keys.Up)
                 {
                     var tostring3 = txt.Lines[txt.Lines.Length - 1];
-                    if (tostring3 == $"{SaveSystem.CurrentSave.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ")
+                    if (tostring3 == $"{SaveSystem.CurrentUser.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ")
                         Console.Write(TerminalBackend.LastCommand);
                     a.SuppressKeyPress = true;
 
@@ -465,7 +465,7 @@ namespace ShiftOS.WinForms.Applications
 
                             if (TerminalBackend.PrefixEnabled)
                             {
-                                Console.Write($"{SaveSystem.CurrentSave.Username}@shiftos:~$ ");
+                                Console.Write($"{SaveSystem.CurrentUser.Username}@shiftos:~$ ");
                             }
                         }
                         catch (Exception ex)
-- 
cgit v1.2.3