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 update source lock

Browse source
This commit is contained in:
Jack251970 2025-05-06 14:13:14 +08:00
parent 639a5aebe5
commit 265fd9c868
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Flow.Launcher/ViewModel/MainViewModel.cs
View file

@ -47,6 +47,7 @@ namespace Flow.Launcher.ViewModel
private CancellationTokenSource _updateSource; // Used to cancel old query flows private CancellationTokenSource _updateSource; // Used to cancel old query flows
private CancellationToken _updateToken; // Used to avoid ObjectDisposedException of _updateSource.Token private CancellationToken _updateToken; // Used to avoid ObjectDisposedException of _updateSource.Token
private readonly object _updateSourceLock = new();
private ChannelWriter<ResultsForUpdate> _resultsUpdateChannelWriter; private ChannelWriter<ResultsForUpdate> _resultsUpdateChannelWriter;
private Task _resultsViewUpdateTask; private Task _resultsViewUpdateTask;
@ -69,8 +70,11 @@ namespace Flow.Launcher.ViewModel
_queryText = ""; _queryText = "";
_lastQuery = new Query(); _lastQuery = new Query();
_ignoredQueryText = null; // null as invalid value _ignoredQueryText = null; // null as invalid value
_updateSource = new CancellationTokenSource(); lock (_updateSourceLock)
_updateToken = _updateSource.Token; {
_updateSource = new CancellationTokenSource();
_updateToken = _updateSource.Token;
}
Settings = Ioc.Default.GetRequiredService<Settings>(); Settings = Ioc.Default.GetRequiredService<Settings>();
Settings.PropertyChanged += (_, args) => Settings.PropertyChanged += (_, args) =>
@ -1240,7 +1244,10 @@ namespace Flow.Launcher.ViewModel
private async Task QueryResultsAsync(bool searchDelay, bool isReQuery = false, bool reSelect = true) private async Task QueryResultsAsync(bool searchDelay, bool isReQuery = false, bool reSelect = true)
{ {
_updateSource?.Cancel(); lock (_updateSourceLock)
{
_updateSource.Cancel();
}
App.API.LogDebug(ClassName, $"Start query with text: <{QueryText}>"); App.API.LogDebug(ClassName, $"Start query with text: <{QueryText}>");
@ -1268,9 +1275,12 @@ namespace Flow.Launcher.ViewModel
var isHomeQuery = query.RawQuery == string.Empty; var isHomeQuery = query.RawQuery == string.Empty;
_updateSource?.Dispose(); // Dispose old update source to fix possible cancellation issue lock (_updateSourceLock)
_updateSource = new CancellationTokenSource(); {
_updateToken = _updateSource.Token; _updateSource.Dispose(); // Dispose old update source to fix possible cancellation issue
_updateSource = new CancellationTokenSource();
_updateToken = _updateSource.Token;
}
ProgressBarVisibility = Visibility.Hidden; ProgressBarVisibility = Visibility.Hidden;
_isQueryRunning = true; _isQueryRunning = true;
@ -1888,7 +1898,10 @@ namespace Flow.Launcher.ViewModel
{ {
if (disposing) if (disposing)
{ {
_updateSource?.Dispose(); lock (_updateSourceLock)
{
_updateSource?.Dispose();
}
_resultsUpdateChannelWriter?.Complete(); _resultsUpdateChannelWriter?.Complete();
if (_resultsViewUpdateTask?.IsCompleted == true) if (_resultsViewUpdateTask?.IsCompleted == true)
{ {