diff options
| author | Michael <[email protected]> | 2017-04-29 10:52:10 -0400 |
|---|---|---|
| committer | Michael <[email protected]> | 2017-04-29 10:52:10 -0400 |
| commit | 9916fafefca35e11edffb91566a3eee3aa90cd95 (patch) | |
| tree | 6c5d7d1220b2abb8c34581734f225079094690fb /ShiftOS.WinForms | |
| parent | fc815c48696e5f3193411ad5decfd1324f06572f (diff) | |
| download | shiftos_thereturn-9916fafefca35e11edffb91566a3eee3aa90cd95.tar.gz shiftos_thereturn-9916fafefca35e11edffb91566a3eee3aa90cd95.tar.bz2 shiftos_thereturn-9916fafefca35e11edffb91566a3eee3aa90cd95.zip | |
fix all beta 2.3 bugs
Diffstat (limited to 'ShiftOS.WinForms')
| -rw-r--r-- | ShiftOS.WinForms/Applications/Terminal.cs | 8 | ||||
| -rw-r--r-- | ShiftOS.WinForms/ShiftOS.WinForms.csproj | 1 | ||||
| -rw-r--r-- | ShiftOS.WinForms/TestCommandsForUpgrades.cs | 20 |
3 files changed, 26 insertions, 3 deletions
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 @@ <Compile Include="ShiftOSConfigFile.cs" /> <Compile Include="SkinCommands.cs" /> <Compile Include="Stories\LegionStory.cs" /> + <Compile Include="TestCommandsForUpgrades.cs" /> <Compile Include="Tools\ColorPickerDataBackend.cs" /> <Compile Include="Tools\ControlManager.cs" /> <Compile Include="Tools\DitheringEngine.cs" /> 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; + } + } +} |
