Skip to content

Commit dea1689

Browse files
committed
fix unexpected different token due to default
1 parent 199aa75 commit dea1689

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

Flow.Launcher/ViewModel/MainViewModel.cs

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -135,13 +135,17 @@ private void RegisterResultsUpdatedEvent()
135135
var plugin = (IResultUpdated)pair.Plugin;
136136
plugin.ResultsUpdated += (s, e) =>
137137
{
138-
if (e.Query.RawQuery == QueryText && !e.Token.IsCancellationRequested)
138+
if (e.Query.RawQuery != QueryText || e.Token.IsCancellationRequested)
139139
{
140-
PluginManager.UpdatePluginMetadata(e.Results, pair.Metadata, e.Query);
141-
if (!_resultsUpdateChannelWriter.TryWrite(new ResultsForUpdate(e.Results, pair.Metadata, e.Query, e.Token)))
142-
{
143-
Log.Error("MainViewModel", "Unable to add item to Result Update Queue");
144-
}
140+
return;
141+
}
142+
143+
var token = e.Token == default ? _updateToken : e.Token;
144+
145+
PluginManager.UpdatePluginMetadata(e.Results, pair.Metadata, e.Query);
146+
if (!_resultsUpdateChannelWriter.TryWrite(new ResultsForUpdate(e.Results, pair.Metadata, e.Query, token)))
147+
{
148+
Log.Error("MainViewModel", "Unable to add item to Result Update Queue");
145149
}
146150
};
147151
}
@@ -459,7 +463,7 @@ private void QueryHistory()
459463
}
460464

461465
private readonly IReadOnlyList<Result> _emptyResult = new List<Result>();
462-
466+
463467
private async void QueryResults()
464468
{
465469
_updateSource?.Cancel();
@@ -553,7 +557,7 @@ async Task QueryTask(PluginPair plugin)
553557
await Task.Yield();
554558

555559
IReadOnlyList<Result> results = await PluginManager.QueryForPluginAsync(plugin, query, currentCancellationToken);
556-
560+
557561
currentCancellationToken.ThrowIfCancellationRequested();
558562

559563
results ??= _emptyResult;

0 commit comments

Comments
 (0)