Skip to content

Commit 3b61f17

Browse files
committed
fix order
1 parent 94aee44 commit 3b61f17

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

src/Files.Uwp/DataModels/SidebarPinnedModel.cs

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -298,8 +298,8 @@ private void AddLocationItemToSidebar(LocationItem locationItem)
298298
{
299299
return;
300300
}
301-
var lastItem = favoriteList.LastOrDefault(x => x.ItemType == NavigationControlItemType.Location && !x.Path.Equals(CommonPaths.RecycleBinPath));
302-
insertIndex = lastItem != null ? favoriteList.IndexOf(lastItem) + 1 : 0;
301+
var lastItem = favoriteList.LastOrDefault(x => x.ItemType is NavigationControlItemType.Location);
302+
insertIndex = lastItem is not null ? favoriteList.IndexOf(lastItem) + 1 : 0;
303303
favoriteList.Insert(insertIndex, locationItem);
304304
}
305305
controller.DataChanged?.Invoke(SectionType.Favorites, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, locationItem, insertIndex));
@@ -310,18 +310,14 @@ private void AddLocationItemToSidebar(LocationItem locationItem)
310310
/// </summary>
311311
public async Task AddAllItemsToSidebar()
312312
{
313-
if (!UserSettingsService.AppearanceSettingsService.ShowFavoritesSection)
313+
if (UserSettingsService.AppearanceSettingsService.ShowFavoritesSection)
314314
{
315-
return;
316-
}
317-
318-
for (int i = 0; i < FavoriteItems.Count; i++)
319-
{
320-
string path = FavoriteItems[i];
321-
await AddItemToSidebarAsync(path);
315+
foreach (string path in FavoriteItems)
316+
{
317+
await AddItemToSidebarAsync(path);
318+
}
319+
ShowHideRecycleBinItem(UserSettingsService.AppearanceSettingsService.PinRecycleBinToSidebar);
322320
}
323-
324-
ShowHideRecycleBinItem(UserSettingsService.AppearanceSettingsService.PinRecycleBinToSidebar);
325321
}
326322

327323
/// <summary>

0 commit comments

Comments
 (0)