Skip to content

Commit ebaffc6

Browse files
committed
Fix result update issue
1 parent 0347703 commit ebaffc6

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

Flow.Launcher/ViewModel/MainViewModel.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ public partial class MainViewModel : BaseModel, ISavable, IDisposable
3232
private static readonly string ClassName = nameof(MainViewModel);
3333

3434
private Query _lastQuery;
35-
private Query _runningQuery;
35+
private Query _runningQuery; // Used for QueryResultAsync
36+
private Query _currentQuery; // Used for ResultsUpdated
3637
private string _queryTextBeforeLeaveResults;
3738

3839
private readonly FlowLauncherJsonStorage<History> _historyItemsStorage;
@@ -237,7 +238,7 @@ public void RegisterResultsUpdatedEvent()
237238
{
238239
Infrastructure.Logger.Log.Debug(ClassName, $"Call IResultsUpdated for QueryText: {e.Query.RawQuery}");
239240

240-
if (_runningQuery == null || e.Query.RawQuery != _runningQuery.RawQuery || e.Token.IsCancellationRequested)
241+
if (_currentQuery == null || e.Query.RawQuery != _currentQuery.RawQuery || e.Token.IsCancellationRequested)
241242
{
242243
Infrastructure.Logger.Log.Debug(ClassName, $"Cancel for QueryText 6: {e.Query.RawQuery}");
243244
return;
@@ -258,7 +259,7 @@ public void RegisterResultsUpdatedEvent()
258259

259260
PluginManager.UpdatePluginMetadata(resultsCopy, pair.Metadata, e.Query);
260261

261-
if (_runningQuery == null || e.Query.RawQuery != _runningQuery.RawQuery || token.IsCancellationRequested)
262+
if (_currentQuery == null || e.Query.RawQuery != _currentQuery.RawQuery || token.IsCancellationRequested)
262263
{
263264
Infrastructure.Logger.Log.Debug(ClassName, $"Cancel for QueryText 7: {e.Query.RawQuery}");
264265
return;
@@ -1253,6 +1254,7 @@ private async Task QueryResultsAsync(bool searchDelay, bool isReQuery = false, b
12531254
Infrastructure.Logger.Log.Debug(ClassName, $"ProgressBar: {Visibility.Hidden}");
12541255

12551256
_runningQuery = query;
1257+
_currentQuery = query;
12561258

12571259
// Switch to ThreadPool thread
12581260
await TaskScheduler.Default;

0 commit comments

Comments
 (0)