Fix: Fixed crash when launching from CMD with "Files" (#13023)

hishitetsu · web-flow · commit 12a7297031d3 · 2023-07-21T10:18:30.000-04:00
diff --git a/src/Files.App/MainWindow.xaml.cs b/src/Files.App/MainWindow.xaml.cs
@@ -73,7 +73,9 @@ public async Task InitializeApplication(object activatedEventArgs)
 			switch (activatedEventArgs)
 			{
 				case ILaunchActivatedEventArgs launchArgs:
-					if (launchArgs.Arguments is not null && launchArgs.Arguments.Contains($"files.exe", StringComparison.OrdinalIgnoreCase))
+					if (launchArgs.Arguments is not null &&
+						(CommandLineParser.SplitArguments(launchArgs.Arguments, true)[0].EndsWith($"files.exe", StringComparison.OrdinalIgnoreCase)
+						|| CommandLineParser.SplitArguments(launchArgs.Arguments, true)[0].EndsWith($"files", StringComparison.OrdinalIgnoreCase)))
 					{
 						// WINUI3: When launching from commandline the argument is not ICommandLineActivatedEventArgs (#10370)
 						var ppm = CommandLineParser.ParseUntrustedCommands(launchArgs.Arguments);

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,9 @@ public async Task InitializeApplication(object activatedEventArgs)`
`73`	`73`	`switch (activatedEventArgs)`
`74`	`74`	`{`
`75`	`75`	`case ILaunchActivatedEventArgs launchArgs:`
`76`		`- if (launchArgs.Arguments is not null && launchArgs.Arguments.Contains($"files.exe", StringComparison.OrdinalIgnoreCase))`
	`76`	`+ if (launchArgs.Arguments is not null &&`
	`77`	`+ (CommandLineParser.SplitArguments(launchArgs.Arguments, true)[0].EndsWith($"files.exe", StringComparison.OrdinalIgnoreCase)`
	`78`	`+ \|\| CommandLineParser.SplitArguments(launchArgs.Arguments, true)[0].EndsWith($"files", StringComparison.OrdinalIgnoreCase)))`
`77`	`79`	`{`
`78`	`80`	`// WINUI3: When launching from commandline the argument is not ICommandLineActivatedEventArgs (#10370)`
`79`	`81`	`var ppm = CommandLineParser.ParseUntrustedCommands(launchArgs.Arguments);`