diff --git a/ShiftOS.WinForms/Applications/Terminal.cs b/ShiftOS.WinForms/Applications/Terminal.cs index a4889e9..3b1a020 100644 --- a/ShiftOS.WinForms/Applications/Terminal.cs +++ b/ShiftOS.WinForms/Applications/Terminal.cs @@ -405,7 +405,6 @@ namespace ShiftOS.WinForms.Applications RemoteGuid = ""; } }; - } private void Terminal_FormClosing(object sender, FormClosingEventArgs e) @@ -425,10 +424,13 @@ namespace ShiftOS.WinForms.Applications { rtbterm.Select(rtbterm.TextLength, 0); } - TerminalBackend.PrintPrompt(); } - + new Thread(() => + { + Thread.Sleep(1000); + TerminalBackend.PrintPrompt(); + }).Start(); } public void OnSkinLoad() diff --git a/ShiftOS.WinForms/ShiftOS.WinForms.csproj b/ShiftOS.WinForms/ShiftOS.WinForms.csproj index 890bbe4..510afed 100644 --- a/ShiftOS.WinForms/ShiftOS.WinForms.csproj +++ b/ShiftOS.WinForms/ShiftOS.WinForms.csproj @@ -355,6 +355,7 @@ + diff --git a/ShiftOS.WinForms/TestCommandsForUpgrades.cs b/ShiftOS.WinForms/TestCommandsForUpgrades.cs new file mode 100644 index 0000000..491cc6a --- /dev/null +++ b/ShiftOS.WinForms/TestCommandsForUpgrades.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using ShiftOS.Engine; + +namespace ShiftOS.WinForms +{ + [Namespace("test")] + public static class TestCommandsForUpgrades + { + [ShiftoriumUpgrade("Test Command", 50, "This is a simple test command", null, "Test")] + [Command("simpletest")] + public static bool Simple() + { + return true; + } + } +} diff --git a/ShiftOS_TheReturn/Shiftorium.cs b/ShiftOS_TheReturn/Shiftorium.cs index 2637f1b..ad60134 100644 --- a/ShiftOS_TheReturn/Shiftorium.cs +++ b/ShiftOS_TheReturn/Shiftorium.cs @@ -445,7 +445,11 @@ namespace ShiftOS.Engine { public ShiftoriumUpgradeAttribute(string name, long cost, string desc, string dependencies, string category) : base(name.ToLower().Replace(" ", "_")) { - + Name = name; + Description = desc; + Dependencies = dependencies; + Cost = cost; + Category = category; } public string Name { get; private set; }