Disable login and fix Skip Launcher setting bug

This commit is contained in:
Chord 2017-03-19 15:58:15 -04:00
parent 7dcfcf81c6
commit c7b43d47b0

View file

@ -59,6 +59,7 @@ namespace PSLauncher
Settings.Default.Reset(); Settings.Default.Reset();
Console.SetOut(new Util.ControlWriter(this.ps_consoleOutput)); Console.SetOut(new Util.ControlWriter(this.ps_consoleOutput));
#endif #endif
skipLauncher.Checked = Settings.Default.SkipLauncher;
// Load server // Load server
loadServerSelection(); loadServerSelection();
@ -76,7 +77,6 @@ namespace PSLauncher
} }
setConsoleWindowState(Settings.Default.OutputShown); setConsoleWindowState(Settings.Default.OutputShown);
skipLauncher.Checked = Settings.Default.SkipLauncher;
} }
private void LauncherForm_FormClosing(object sender, FormClosingEventArgs e) private void LauncherForm_FormClosing(object sender, FormClosingEventArgs e)
@ -224,7 +224,11 @@ namespace PSLauncher
} }
else else
{ {
startLaunching(); setErrorMessage("Login disabled. Use skip launcher");
gameStopped();
return;
/*startLaunching();
Task.Factory.StartNew(() => Task.Factory.StartNew(() =>
{ {
@ -236,7 +240,7 @@ namespace PSLauncher
{ {
gameRunning(); gameRunning();
} }
}); });*/
} }
} }