Skip to content

Commit d2a4a0b

Browse files
authored
Fix: Fixed issue where navigating away from search wouldn't show the folders items (#12628)
1 parent 3984d73 commit d2a4a0b

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

src/Files.App/Data/Models/ItemViewModel.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -539,12 +539,18 @@ await dispatcherQueue.EnqueueOrInvokeAsync(() =>
539539
}
540540
}
541541

542+
private bool IsLoadingCancelled { get; set; }
543+
542544
public void CancelLoadAndClearFiles()
543545
{
544546
Debug.WriteLine("CancelLoadAndClearFiles");
545547
CloseWatcher();
546548
if (IsLoadingItems)
549+
{
550+
IsLoadingCancelled = true;
547551
addFilesCTS.Cancel();
552+
addFilesCTS = new CancellationTokenSource();
553+
}
548554
CancelExtendedPropertiesLoading();
549555
filesAndFolders.Clear();
550556
FilesAndFolders.Clear();
@@ -1418,9 +1424,9 @@ private async Task RapidAddItemsToCollection(string? path, LibraryItem? library
14181424

14191425
await GetDefaultItemIcons(folderSettings.GetIconSize());
14201426

1421-
if (addFilesCTS.IsCancellationRequested)
1427+
if (IsLoadingCancelled)
14221428
{
1423-
addFilesCTS = new CancellationTokenSource();
1429+
IsLoadingCancelled = false;
14241430
IsLoadingItems = false;
14251431
return;
14261432
}

0 commit comments

Comments
 (0)