diff options
| author | aren-cllc <[email protected]> | 2017-02-08 16:17:28 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-02-08 16:17:28 +0100 |
| commit | 1ac01d9a271dec29709afda268f225e979c8caba (patch) | |
| tree | 5be47a87da5dc07b794ebd2b660ed0a12eb71dcd | |
| parent | 982c575f9adaf4c12ef3911033d44e0e78d138f8 (diff) | |
| download | shiftos_thereturn-1ac01d9a271dec29709afda268f225e979c8caba.tar.gz shiftos_thereturn-1ac01d9a271dec29709afda268f225e979c8caba.tar.bz2 shiftos_thereturn-1ac01d9a271dec29709afda268f225e979c8caba.zip | |
This should help debug the tutorial hang issue
Please don't merge this yet, as VS may have messed something up again. I will comment once I checked if everything works.
| -rw-r--r-- | ShiftOS.WinForms/Oobe.cs | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/ShiftOS.WinForms/Oobe.cs b/ShiftOS.WinForms/Oobe.cs index 98aaebd..dbec174 100644 --- a/ShiftOS.WinForms/Oobe.cs +++ b/ShiftOS.WinForms/Oobe.cs @@ -210,11 +210,12 @@ namespace ShiftOS.WinForms SaveSystem.SaveGame(); Thread.Sleep(3000); - this.Invoke(new Action(() => - { + try { TutorialManager.StartTutorial(); - })); - TutorialManager.StartTutorial(); + } catch (Exeption e) { + TextType("An error has occoured while starting the tutorial"); + TextType(e.ToString()); + } this.Close(); } 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) => |
