prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add Lock to the place we directly update the ResultCollection

Browse source
This commit is contained in:
弘韬 张 2020-12-02 13:56:50 +08:00
parent a640eadf1b
commit 19c7446552
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Flow.Launcher/ViewModel/ResultsViewModel.cs
View file

@ -120,17 +120,20 @@ namespace Flow.Launcher.ViewModel
public void Clear()
{
Results.RemoveAll();
lock (_collectionLock)
Results.RemoveAll();
}
public void KeepResultsFor(PluginMetadata metadata)
{
Results.Update(Results.Where(r => r.Result.PluginID == metadata.ID).ToList());
lock (_collectionLock)
Results.Update(Results.Where(r => r.Result.PluginID == metadata.ID).ToList());
}
public void KeepResultsExcept(PluginMetadata metadata)
{
Results.Update(Results.Where(r => r.Result.PluginID != metadata.ID).ToList());
lock (_collectionLock)
Results.Update(Results.Where(r => r.Result.PluginID != metadata.ID).ToList());
}
@ -148,7 +151,8 @@ namespace Flow.Launcher.ViewModel
// update UI in one run, so it can avoid UI flickering
Results.Update(newResults);
SelectedItem = newResults[0];
if (newResults.Any())
SelectedItem = newResults[0];
}
if (Visbility != Visibility.Visible && Results.Count > 0)
@ -304,6 +308,9 @@ namespace Flow.Launcher.ViewModel
OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
}
/// <summary>
/// Update the results collection with new results, try to keep identical results
/// </summary>
@ -311,9 +318,9 @@ namespace Flow.Launcher.ViewModel
/// <param name="token">Cancellation Token</param>
public void Update(List<ResultViewModel> newItems, CancellationToken? token = null)
{
if (newItems.Count == 0 || (token?.IsCancellationRequested ?? false))
if (token?.IsCancellationRequested ?? false)
return;
if (editTime < 5 || newItems.Count < 30)
{