Skip to content

Commit fcabe05

Browse files
authored
Fix: Fixed an issue where folders with file extensions were sometimes treated as files (#16118)
1 parent f3c671e commit fcabe05

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/Files.App/Data/Items/ListedItem.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ public override string ToString()
412412
public bool IsArchive => this is ZipItem;
413413
public bool IsAlternateStream => this is AlternateStreamItem;
414414
public bool IsGitItem => this is GitItem;
415-
public virtual bool IsExecutable => FileExtensionHelpers.IsExecutableFile(ItemPath);
415+
public virtual bool IsExecutable => !IsFolder && FileExtensionHelpers.IsExecutableFile(ItemPath);
416416
public virtual bool IsScriptFile => FileExtensionHelpers.IsScriptFile(ItemPath);
417417
public bool IsPinned => App.QuickAccessManager.Model.PinnedFolders.Contains(itemPath);
418418
public bool IsDriveRoot => ItemPath == PathNormalization.GetPathRoot(ItemPath);

src/Files.App/ViewModels/UserControls/AddressToolbarViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1032,7 +1032,7 @@ public List<ListedItem> SelectedItems
10321032
public bool HasAdditionalAction => InstanceViewModel.IsPageTypeRecycleBin || IsPowerShellScript || CanExtract || IsImage || IsFont || IsInfFile;
10331033
public bool CanCopy => SelectedItems is not null && SelectedItems.Any();
10341034
public bool CanExtract => IsArchiveOpened ? (SelectedItems is null || !SelectedItems.Any()) : IsSelectionArchivesOnly;
1035-
public bool IsArchiveOpened => FileExtensionHelpers.IsZipFile(Path.GetExtension(pathControlDisplayText));
1035+
public bool IsArchiveOpened => InstanceViewModel.IsPageTypeZipFolder;
10361036
public bool IsSelectionArchivesOnly => SelectedItems is not null && SelectedItems.Any() && SelectedItems.All(x => FileExtensionHelpers.IsZipFile(x.FileExtension)) && !InstanceViewModel.IsPageTypeRecycleBin;
10371037
public bool IsMultipleArchivesSelected => IsSelectionArchivesOnly && SelectedItems.Count > 1;
10381038
public bool IsPowerShellScript => SelectedItems is not null && SelectedItems.Count == 1 && FileExtensionHelpers.IsPowerShellFile(SelectedItems.First().FileExtension) && !InstanceViewModel.IsPageTypeRecycleBin;

0 commit comments

Comments
 (0)