Skip to content

Fix: Fixed DirectoryNotFoundException when pinning items to the start menu #15865

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 1 commit into from
Jul 25, 2024
Merged

Fix: Fixed DirectoryNotFoundException when pinning items to the start menu #15865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 8 additions & 5 deletions src/Files.App/Actions/Start/PinToStartAction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,15 @@ public async Task ExecuteAsync(object? parameter = null)
{
foreach (ListedItem listedItem in context.ShellPage.SlimContentPage.SelectedItems)
{
IStorable storable = listedItem.IsFolder switch
await SafetyExtensions.IgnoreExceptions(async () =>
{
true => await StorageService.GetFolderAsync(listedItem.ItemPath),
_ => await StorageService.GetFileAsync((listedItem as ShortcutItem)?.TargetPath ?? listedItem.ItemPath)
};
await StartMenuService.PinAsync(storable, listedItem.Name);
IStorable storable = listedItem.IsFolder switch
{
true => await StorageService.GetFolderAsync(listedItem.ItemPath),
_ => await StorageService.GetFileAsync((listedItem as ShortcutItem)?.TargetPath ?? listedItem.ItemPath)
};
await StartMenuService.PinAsync(storable, listedItem.Name);
});
}
}
else if (context.ShellPage?.ShellViewModel?.CurrentFolder is not null)
Expand Down
13 changes: 8 additions & 5 deletions src/Files.App/Actions/Start/UnpinFromStartAction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,15 @@ public async Task ExecuteAsync(object? parameter = null)
{
foreach (ListedItem listedItem in context.ShellPage?.SlimContentPage.SelectedItems)
{
IStorable storable = listedItem.IsFolder switch
await SafetyExtensions.IgnoreExceptions(async () =>
{
true => await StorageService.GetFolderAsync(listedItem.ItemPath),
_ => await StorageService.GetFileAsync((listedItem as ShortcutItem)?.TargetPath ?? listedItem.ItemPath)
};
await StartMenuService.UnpinAsync(storable);
IStorable storable = listedItem.IsFolder switch
{
true => await StorageService.GetFolderAsync(listedItem.ItemPath),
_ => await StorageService.GetFileAsync((listedItem as ShortcutItem)?.TargetPath ?? listedItem.ItemPath)
};
await StartMenuService.UnpinAsync(storable);
});
}
}
else
Expand Down