Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions Launcher/Pages/LauncherPage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -322,15 +322,17 @@ private async void BtnPlay_Click(object sender, RoutedEventArgs e)
bool hasWin = incoming.Any(a => a.Equals("-win", StringComparison.OrdinalIgnoreCase));
bool hasXRes = incoming.Any(a => a.Equals("-xres", StringComparison.OrdinalIgnoreCase));
bool hasYRes = incoming.Any(a => a.Equals("-yres", StringComparison.OrdinalIgnoreCase));
bool fullscreenOverride = incoming.Any(a => a.Equals("-fullscreen", StringComparison.OrdinalIgnoreCase));

var argParts = incoming.ToList();
var argParts = incoming
.Where(a => !a.Equals("-fullscreen", StringComparison.OrdinalIgnoreCase)
&& (!fullscreenOverride || !a.Equals("-win", StringComparison.OrdinalIgnoreCase)))
.ToList();

if (LaunchOptions.Windowed && !hasWin) argParts.Add("-win");
if (LaunchOptions.Windowed && !fullscreenOverride && !hasWin) argParts.Add("-win");
if (LaunchOptions.Windowed && !hasXRes) { argParts.Add("-xres"); argParts.Add(LaunchOptions.WindowedWidth.ToString()); }
if (LaunchOptions.Windowed && !hasYRes) { argParts.Add("-yres"); argParts.Add(LaunchOptions.WindowedHeight.ToString()); }

string arguments = string.Join(" ", argParts);

bool isEasyAntiCheat = false;
try
{
Expand All @@ -356,7 +358,11 @@ private async void BtnPlay_Click(object sender, RoutedEventArgs e)
else
exe = isEasyAntiCheat ? "EAC_LaunchGeneralsOnline.exe" : "GeneralsOnlineZH_60.exe";

var startedProcess = Process.Start(exe, arguments);
var startInfo = new ProcessStartInfo(exe);
foreach (string argument in argParts)
startInfo.ArgumentList.Add(argument);

var startedProcess = Process.Start(startInfo);

// Hide the launcher while the game runs, then exit once the game closes.
Application.Current.MainWindow?.Hide();
Expand Down