Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 18, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66daf23
Revert "Fix: Fixed an issue with opening shell locations on startup (…
gave92 Nov 18, 2025
6714f89
Fix cross thread exception when loading shell folders
gave92 Nov 18, 2025
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
6 changes: 2 additions & 4 deletions src/Files.App/Helpers/Win32/Win32Helper.Shell.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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) ||
Expand Down
8 changes: 8 additions & 0 deletions src/Files.App/MainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading