shiftos-archive/ShiftOS_TheReturn
1
0
Fork 0
mirror of https://git.alee14.me/shiftos-archive/ShiftOS_TheReturn.git synced 2025-01-22 18:02:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #56 from aren-cllc/patch-1

Browse source 
This should help debug the tutorial hang issue
This commit is contained in:
Michael VanOverbeek 2017-02-08 10:40:00 -05:00 committed by GitHub
commit 530d34e1ae
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ShiftOS.WinForms/Oobe.cs
View file

@ -210,12 +210,13 @@ namespace ShiftOS.WinForms
SaveSystem.SaveGame();
Thread.Sleep(3000);
this.Invoke(new Action(() =>
{
try {
TutorialManager.StartTutorial();
}));
TutorialManager.StartTutorial();
this.Close();
} catch (Exception e) {
TextType("An error has occoured while starting the tutorial");
TextType(e.ToString());
}
//this.Close(); // This has been commented out because the form closes when the error appears. Uncomment this if no more errors appear
}
catch(Exception e)
{
@ -368,7 +369,9 @@ namespace ShiftOS.WinForms
Shiftorium.Silent = false;
foreach(var frm in AppearanceManager.OpenForms)
{
frm.Close();
(frm as Form).Invoke(new Action(() => {
frm.Close();
}));
}
TerminalBackend.CommandProcessed += (cmd, args) =>