From 512a02ba88678cb7ddd65f32245135c8cf2ba1c3 Mon Sep 17 00:00:00 2001
From: Michael <Michael@some.where>
Date: Wed, 8 Feb 2017 11:20:02 -0500
Subject: Mind my language...

We finally fixed the god damn fucking fuckity fucking Tutorial bug.
Finally, for fucks sake.
---
 ShiftOS_TheReturn/SaveSystem.cs | 13 ++++++++-----
 ShiftOS_TheReturn/Shiftorium.cs |  9 +++++----
 2 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'ShiftOS_TheReturn')

diff --git a/ShiftOS_TheReturn/SaveSystem.cs b/ShiftOS_TheReturn/SaveSystem.cs
index 2e9f9c1..6ab6b1b 100644
--- a/ShiftOS_TheReturn/SaveSystem.cs
+++ b/ShiftOS_TheReturn/SaveSystem.cs
@@ -176,24 +176,27 @@ namespace ShiftOS.Engine
                     Console.WriteLine("   ...{DONE}.");
                 }
 
-                Story.Start();
-
-
                 Thread.Sleep(50);
                 Console.WriteLine("{SYSTEM_INITIATED}");
 
                 TerminalBackend.InStory = false;
+                TerminalBackend.PrefixEnabled = true;
                 Shiftorium.LogOrphanedUpgrades = true;
                 Desktop.InvokeOnWorkerThread(new Action(() => Desktop.PopulateAppLauncher()));
-                GameReady?.Invoke();
                 if (CurrentSave.StoryPosition == 1)
                 {
                     Desktop.InvokeOnWorkerThread(new Action(() =>
                     {
                         TutorialManager.StartTutorial();
+                        
                     }));
+                    while(TutorialManager.IsInTutorial == true) { }
+                        GameReady?.Invoke();
+                }
+                else
+                {
+                    GameReady?.Invoke();
                 }
-
             }));
             thread.IsBackground = true;
             thread.Start();
diff --git a/ShiftOS_TheReturn/Shiftorium.cs b/ShiftOS_TheReturn/Shiftorium.cs
index 1b09818..06a189f 100644
--- a/ShiftOS_TheReturn/Shiftorium.cs
+++ b/ShiftOS_TheReturn/Shiftorium.cs
@@ -122,11 +122,14 @@ namespace ShiftOS.Engine
             return true;
         }
 
+        public static bool IsInitiated { get; private set; }
 
         public static void Init()
         {
-            try
+            if (IsInitiated == false)
             {
+                IsInitiated = true;
+                //Let the crash handler deal with this one...
                 var dict = GetDefaults();
                 foreach (var itm in dict)
                 {
@@ -136,9 +139,7 @@ namespace ShiftOS.Engine
                     }
                 }
             }
-            catch
-            {
-            }
+
         }
 
         public static int GetCPValue(string id)
-- 
cgit v1.2.3