aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael <[email protected]>2017-05-08 12:09:45 -0400
committerMichael <[email protected]>2017-05-08 12:09:45 -0400
commit64f491ff2821f99fc7485d9b062cc75c7d8fff1c (patch)
tree555152632b204116f1da06424d37398579634c1a
parent75ed7e9215ba88358d9b838dd82fa3841f78ae5a (diff)
downloadshiftos_thereturn-64f491ff2821f99fc7485d9b062cc75c7d8fff1c.tar.gz
shiftos_thereturn-64f491ff2821f99fc7485d9b062cc75c7d8fff1c.tar.bz2
shiftos_thereturn-64f491ff2821f99fc7485d9b062cc75c7d8fff1c.zip
Fix softlock when creating new saves.
-rw-r--r--ShiftOS.WinForms/Oobe.cs2
-rw-r--r--ShiftOS.WinForms/OobeStory.cs6
2 files changed, 4 insertions, 4 deletions
diff --git a/ShiftOS.WinForms/Oobe.cs b/ShiftOS.WinForms/Oobe.cs
index a4d63e0..0bcb290 100644
--- a/ShiftOS.WinForms/Oobe.cs
+++ b/ShiftOS.WinForms/Oobe.cs
@@ -316,7 +316,9 @@ You must join the digital society, rise up the ranks, and save us.
{
sve.StoryPosition = 8675309;
SaveSystem.CurrentSave = sve;
+ Shiftorium.Silent = true;
SaveSystem.SaveGame();
+ Shiftorium.Silent = false;
});
}
diff --git a/ShiftOS.WinForms/OobeStory.cs b/ShiftOS.WinForms/OobeStory.cs
index 39ca5b5..a35e1d8 100644
--- a/ShiftOS.WinForms/OobeStory.cs
+++ b/ShiftOS.WinForms/OobeStory.cs
@@ -141,11 +141,9 @@ namespace ShiftOS.WinForms
Console.WriteLine();
Console.WriteLine("Next, let's get user information.");
Console.WriteLine();
- Desktop.InvokeOnWorkerThread(() =>
- {
- ShiftOS.Engine.OutOfBoxExperience.PromptForLogin();
- });
+ ShiftOS.Engine.OutOfBoxExperience.PromptForLogin();
}
+
private static bool isValid(string text, string chars)
{
foreach(var c in text)