Skip to content

Fix: Fixed issue where archives opened in new tab instead of existing one #17394

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix: Fixed issue where archives opened in new tab instead of existing one #17394

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
f032a36
check all file associations
marcofranzen99 Aug 1, 2025
11b054b
avoid async call if not needed
marcofranzen99 Aug 8, 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
41 changes: 26 additions & 15 deletions src/Files.App/Helpers/Win32/Win32Helper.Storage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,26 +165,25 @@ public static Task StartSTATask(Action action)

public static async Task<string?> GetFileAssociationAsync(string filename, bool checkDesktopFirst = false)
{
// Find UWP apps
async Task<string?> GetUwpAssoc()
{
var uwpApps = await Launcher.FindFileHandlersAsync(Path.GetExtension(filename));
return uwpApps.Any() ? uwpApps[0].PackageFamilyName : null;
}

// Find desktop apps
string? GetDesktopAssoc()
if (checkDesktopFirst)
{
var lpResult = new StringBuilder(2048);
var hResult = Shell32.FindExecutable(filename, null, lpResult);
var desktopAssociation = GetDesktopFileAssociation(filename);
if (desktopAssociation is not null)
return desktopAssociation;

return hResult.ToInt64() > 32 ? lpResult.ToString() : null;
return (await GetUwpFileAssociations(filename)).FirstOrDefault();
}

if (checkDesktopFirst)
return GetDesktopAssoc() ?? await GetUwpAssoc();
return (await GetUwpFileAssociations(filename)).FirstOrDefault() ?? GetDesktopFileAssociation(filename);
}

return await GetUwpAssoc() ?? GetDesktopAssoc();
public static async Task<IEnumerable<string>> GetAllFileAssociationsAsync(string filename)
{
var uwpApps = await GetUwpFileAssociations(filename);
var desktopApp = GetDesktopFileAssociation(filename);
return desktopApp is not null
? uwpApps.Append(desktopApp)
: uwpApps;
}

public static string ExtractStringFromDLL(string file, int number)
Expand Down Expand Up @@ -1210,5 +1209,17 @@ public static bool GetWin32FindDataForPath(string targetPath, out Win32PInvoke.W

return false;
}
private static async Task<IEnumerable<string>> GetUwpFileAssociations(string filename)
{
var uwpApps = await Launcher.FindFileHandlersAsync(Path.GetExtension(filename));
return uwpApps.Select(x => x.PackageFamilyName);
}

private static string? GetDesktopFileAssociation(string filename)
{
var lpResult = new StringBuilder(2048);
var hResult = Shell32.FindExecutable(filename, null, lpResult);
return hResult.ToInt64() > 32 ? lpResult.ToString() : null;
}
}
}
13 changes: 5 additions & 8 deletions src/Files.App/Utils/Storage/StorageItems/ZipStorageFolder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,11 @@ public static async Task<bool> CheckDefaultZipApp(string filePath)
{
Func<Task<bool>> queryFileAssoc = async () =>
{
var assoc = await Win32Helper.GetFileAssociationAsync(filePath);
if (assoc is not null)
{
return assoc == Package.Current.Id.FamilyName
|| assoc.EndsWith("Files.App\\Files.exe", StringComparison.OrdinalIgnoreCase)
|| assoc.Equals(IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Windows), "explorer.exe"), StringComparison.OrdinalIgnoreCase);
}
return true;
var associations = await Win32Helper.GetAllFileAssociationsAsync(filePath);
return associations.Any(assoc =>
assoc == Package.Current.Id.FamilyName
|| assoc.EndsWith("Files.App\\Files.exe", StringComparison.OrdinalIgnoreCase)
|| assoc.Equals(IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Windows), "explorer.exe"), StringComparison.OrdinalIgnoreCase));
};
var ext = IO.Path.GetExtension(filePath)?.ToLowerInvariant();
return await defaultAppDict.GetAsync(ext, queryFileAssoc);
Expand Down
Loading