Fix: Fixed an issue with opening shell locations on startup (#17885)

Author: gave92

src/Files.App/Helpers/Win32/Win32Helper.Shell.cs

@@ -13,10 +13,6 @@ namespace Files.App.Helpers
 	/// </summary>
 	public static partial class Win32Helper
 	{
-		private readonly static ShellFolder _controlPanel = new(Shell32.KNOWNFOLDERID.FOLDERID_ControlPanelFolder);
-
-		private readonly static ShellFolder _controlPanelCategoryView = new("::{26EE0668-A00A-44D7-9371-BEB064C98683}");
-
 		public static async Task<(ShellFileItem Folder, List<ShellFileItem> Enumerate)> GetShellFolderAsync(string path, bool getFolder, bool getEnumerate, int from, int count, params string[] properties)
 		{
 			if (path.StartsWith("::{", StringComparison.Ordinal))
@@ -32,6 +28,8 @@ public static partial class Win32Helper
 				try
 				{
 					using var shellFolder = ShellFolderExtensions.GetShellItemFromPathOrPIDL(path) as ShellFolder;
+					using ShellFolder _controlPanel = new(Shell32.KNOWNFOLDERID.FOLDERID_ControlPanelFolder);
+					using ShellFolder _controlPanelCategoryView = new("::{26EE0668-A00A-44D7-9371-BEB064C98683}");
 
 					if (shellFolder is null ||
 						(_controlPanel.PIDL.IsParentOf(shellFolder.PIDL, false) ||

src/Files.App/MainWindow.xaml.cs

@@ -253,6 +253,14 @@ private async Task InitializeFromCmdLineArgsAsync(Frame rootFrame, ParsedCommand
 		{
 			async Task PerformNavigationAsync(string payload, string selectItem = null)
 			{
+				if (!string.IsNullOrEmpty(payload))
+				{
+					payload = Constants.UserEnvironmentPaths.ShellPlaces.Get(payload.ToUpperInvariant(), payload);
+					var folder = (StorageFolder)await FilesystemTasks.Wrap(() => StorageFolder.GetFolderFromPathAsync(payload).AsTask());
+					if (folder is not null && !string.IsNullOrEmpty(folder.Path))
+						payload = folder.Path; // Convert short name to long name (#6190)
+				}
+
 				var generalSettingsService = Ioc.Default.GetService<IGeneralSettingsService>();
 
 				double boundsWidth = 0;