Skip to content

Commit ed2b74d

Browse files
committed
Fix: Fixed Columns View appearing in Recycle Bin when DefaultLayoutMode is set to Columns with sync disabled.
1 parent cbc4965 commit ed2b74d

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -486,23 +486,6 @@ public static void SetLayoutPreferencesForPath(string path, LayoutPreferencesIte
486486

487487
private static LayoutPreferencesItem? GetLayoutPreferencesForPath(string path)
488488
{
489-
if (!UserSettingsService.LayoutSettingsService.SyncFolderPreferencesAcrossDirectories)
490-
{
491-
path = path.TrimPath() ?? string.Empty;
492-
493-
return SafetyExtensions.IgnoreExceptions(() =>
494-
{
495-
if (path.StartsWith("tag:", StringComparison.Ordinal))
496-
return GetLayoutPreferencesFromDatabase("Home", null);
497-
498-
var folderFRN = Win32Helper.GetFolderFRN(path);
499-
500-
return GetLayoutPreferencesFromDatabase(path, folderFRN)
501-
?? GetLayoutPreferencesFromAds(path, folderFRN);
502-
}, App.Logger)
503-
?? GetDefaultLayoutPreferences(path);
504-
}
505-
506489
if (path.StartsWith(Constants.UserEnvironmentPaths.RecycleBinPath, StringComparison.Ordinal))
507490
{
508491
var trimmedPath = path.TrimPath() ?? string.Empty;
@@ -525,6 +508,23 @@ public static void SetLayoutPreferencesForPath(string path, LayoutPreferencesIte
525508
return defaultPref;
526509
}
527510

511+
if (!UserSettingsService.LayoutSettingsService.SyncFolderPreferencesAcrossDirectories)
512+
{
513+
path = path.TrimPath() ?? string.Empty;
514+
515+
return SafetyExtensions.IgnoreExceptions(() =>
516+
{
517+
if (path.StartsWith("tag:", StringComparison.Ordinal))
518+
return GetLayoutPreferencesFromDatabase("Home", null);
519+
520+
var folderFRN = Win32Helper.GetFolderFRN(path);
521+
522+
return GetLayoutPreferencesFromDatabase(path, folderFRN)
523+
?? GetLayoutPreferencesFromAds(path, folderFRN);
524+
}, App.Logger)
525+
?? GetDefaultLayoutPreferences(path);
526+
}
527+
528528
return new LayoutPreferencesItem();
529529
}
530530

0 commit comments

Comments
 (0)