Skip to content

Do not cancel tasks which requires clearing existing results #3577

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 3 commits into from
Closed

Do not cancel tasks which requires clearing existing results #3577

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ee52d7
Do not cancel tasks which is for clearing existing results
Jack251970 May 23, 2025
445ca9a
Do not pass token to make sure it is handled
Jack251970 May 23, 2025
634e829
Improve code comments
Jack251970 May 23, 2025
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
16 changes: 13 additions & 3 deletions Flow.Launcher/ViewModel/MainViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,8 @@
await Task.Delay(20);
while (channelReader.TryRead(out var item))
{
if (!item.Token.IsCancellationRequested)
// If this update task is for clearing existing results, we must need to add it to the queue
if (!item.Token.IsCancellationRequested || item.shouldClearExistingResults)
queue[item.ID] = item;
}

Expand Down Expand Up @@ -1842,7 +1843,7 @@
VisibilityChanged?.Invoke(this, new VisibilityChangedEventArgs { IsVisible = false });
}

#pragma warning restore VSTHRD100 // Avoid async void methods

Check warning on line 1846 in Flow.Launcher/ViewModel/MainViewModel.cs

View workflow job for this annotation

GitHub Actions / Check Spelling 

`VSTHRD` is not a recognized word. (unrecognized-spelling)

/// <summary>
/// Save history, user selected records and top most records
Expand All @@ -1861,12 +1862,21 @@
{
if (!resultsForUpdates.Any())
return;

CancellationToken token;

try
{
// Don't know why sometimes even resultsForUpdates is empty, the method won't return;
token = resultsForUpdates.Select(r => r.Token).Distinct().SingleOrDefault();
// If there are any update tasks for clearing existing results, we need to set token to default so that it will not be cancelled
if (resultsForUpdates.Any(r => r.shouldClearExistingResults))
{
token = default;
}
else
{
// Don't know why sometimes even resultsForUpdates is empty, the method won't return;
token = resultsForUpdates.Select(r => r.Token).Distinct().SingleOrDefault();
}
}
#if DEBUG
catch
Expand Down
Loading