Skip to content

Commit 7a44270

Browse files
committed
Fix: Fixed duplicate Recycle Bin layout condition caused by a merge conflict resolution
1 parent 6121d46 commit 7a44270

File tree

1 file changed

+0
-22
lines changed

1 file changed

+0
-22
lines changed

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

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -525,28 +525,6 @@ public static void SetLayoutPreferencesForPath(string path, LayoutPreferencesIte
525525
?? GetDefaultLayoutPreferences(path);
526526
}
527527

528-
if (path.StartsWith(Constants.UserEnvironmentPaths.RecycleBinPath, StringComparison.Ordinal))
529-
{
530-
var trimmedPath = path.TrimPath() ?? string.Empty;
531-
532-
var recycleBinPreference = SafetyExtensions.IgnoreExceptions(() =>
533-
{
534-
var folderFRN = Win32Helper.GetFolderFRN(trimmedPath);
535-
536-
return GetLayoutPreferencesFromDatabase(trimmedPath, folderFRN)
537-
?? GetLayoutPreferencesFromAds(trimmedPath, folderFRN);
538-
}, App.Logger);
539-
540-
if (recycleBinPreference is not null && recycleBinPreference.LayoutMode != FolderLayoutModes.ColumnView)
541-
return recycleBinPreference;
542-
543-
var defaultPref = new LayoutPreferencesItem();
544-
if (defaultPref.LayoutMode == FolderLayoutModes.ColumnView)
545-
defaultPref.LayoutMode = FolderLayoutModes.DetailsView;
546-
547-
return defaultPref;
548-
}
549-
550528
return new LayoutPreferencesItem();
551529
}
552530

0 commit comments

Comments
 (0)