Skip to content

Fix: Return default layout preferences if path is inaccessible #17391

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

Closed
wants to merge 1 commit into from
Closed

Fix: Return default layout preferences if path is inaccessible #17391

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
15 changes: 15 additions & 0 deletions src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,9 @@
{
if (!UserSettingsService.LayoutSettingsService.SyncFolderPreferencesAcrossDirectories)
{
if (!IsPathAccessible(path))
return GetDefaultLayoutPreferences(path);

path = path.TrimPath() ?? string.Empty;

return SafetyExtensions.IgnoreExceptions(() =>
Expand Down Expand Up @@ -563,6 +566,18 @@
}
}

private static bool IsPathAccessible(string path)
{
try
{
return !string.IsNullOrEmpty(path) && Directory.Exists(path);

Check failure on line 573 in src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs

View workflow job for this annotation

GitHub Actions / build (Debug, arm64) 

The name 'Directory' does not exist in the current context

Check failure on line 573 in src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs

View workflow job for this annotation

GitHub Actions / build (Debug, x64) 

The name 'Directory' does not exist in the current context

Check failure on line 573 in src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs

View workflow job for this annotation

GitHub Actions / build (Release, arm64) 

The name 'Directory' does not exist in the current context

Check failure on line 573 in src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs

View workflow job for this annotation

GitHub Actions / build (Release, x64) 

The name 'Directory' does not exist in the current context
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are also paths that indicate the home page or tag search results, but this code ignores them and is inappropriate.

}
catch (Exception)
{
return false;
}
}

private static bool SetLayoutPreferencesToDatabase(string path, ulong? frn, LayoutPreferencesItem preferencesItem)
{
if (string.IsNullOrEmpty(path))
Expand Down
Loading