From 01c347c5621a687cfac8889a32e50bd1d16628c8 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 2 Jul 2017 08:34:17 -0400 Subject: [PATCH] Fix softlock in shiftorium gui boot --- ShiftOS.WinForms/Applications/ShiftoriumFrontend.cs | 1 - ShiftOS.WinForms/Commands.cs | 4 +--- ShiftOS_TheReturn/Story.cs | 1 + 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ShiftOS.WinForms/Applications/ShiftoriumFrontend.cs b/ShiftOS.WinForms/Applications/ShiftoriumFrontend.cs index f6f3c7f..ab94d11 100644 --- a/ShiftOS.WinForms/Applications/ShiftoriumFrontend.cs +++ b/ShiftOS.WinForms/Applications/ShiftoriumFrontend.cs @@ -109,7 +109,6 @@ namespace ShiftOS.WinForms.Applications }); t.Start(); } - while (numComplete < cats.Length) { } // wait for all threads to finish their job } private void SetList() diff --git a/ShiftOS.WinForms/Commands.cs b/ShiftOS.WinForms/Commands.cs index c9e9376..ad1abe4 100644 --- a/ShiftOS.WinForms/Commands.cs +++ b/ShiftOS.WinForms/Commands.cs @@ -248,9 +248,7 @@ namespace ShiftOS.Engine var upg = Shiftorium.GetAvailable().FirstOrDefault(x => x.ID == upgrade); if(upg != null) { - if (Shiftorium.Buy(upg.ID, upg.Cost) == true) - Console.WriteLine("{RES_UPGRADEINSTALLED}"); - else + if (!Shiftorium.Buy(upg.ID, upg.Cost) == true) Console.WriteLine("{ERR_NOTENOUGHCODEPOINTS}"); } else diff --git a/ShiftOS_TheReturn/Story.cs b/ShiftOS_TheReturn/Story.cs index 48cf926..48cf70d 100644 --- a/ShiftOS_TheReturn/Story.cs +++ b/ShiftOS_TheReturn/Story.cs @@ -82,6 +82,7 @@ namespace ShiftOS.Engine public void Complete() { + Thread.Sleep(20); onComplete?.Invoke(); } }