Dispose _updateSource when creating new one & Use _updateToken instead of _updateSource.Token

Author: Jack251970

Flow.Launcher/ViewModel/MainViewModel.cs

@@ -34,7 +34,7 @@ public partial class MainViewModel : BaseModel, ISavable, IDisposable
         private bool _isQueryRunning;
         private Query _lastQuery;
         private string _queryTextBeforeLeaveResults;
-        private string _ignoredQueryText = null;
+        private string _ignoredQueryText; // Used to ignore query text change when switching between context menu and query results
 
         private readonly FlowLauncherJsonStorage<History> _historyItemsStorage;
         private readonly FlowLauncherJsonStorage<UserSelectedRecord> _userSelectedRecordStorage;
@@ -45,6 +45,7 @@ public partial class MainViewModel : BaseModel, ISavable, IDisposable
         private readonly TopMostRecord _topMostRecord;
 
         private CancellationTokenSource _updateSource; // Used to cancel old query flows
+        private CancellationToken _updateToken; // Used to avoid ObjectDisposedException of _updateSource.Token
 
         private ChannelWriter<ResultsForUpdate> _resultsUpdateChannelWriter;
         private Task _resultsViewUpdateTask;
@@ -60,6 +61,9 @@ public MainViewModel()
             _queryTextBeforeLeaveResults = "";
             _queryText = "";
             _lastQuery = new Query();
+            _ignoredQueryText = null;
+            _updateSource = new CancellationTokenSource();
+            _updateToken = _updateSource.Token;
 
             Settings = Ioc.Default.GetRequiredService<Settings>();
             Settings.PropertyChanged += (_, args) =>
@@ -241,7 +245,7 @@ public void RegisterResultsUpdatedEvent()
                         return;
                     }
 
-                    var token = e.Token == default ? _updateSource.Token : e.Token;
+                    var token = e.Token == default ? _updateToken : e.Token;
 
                     // make a clone to avoid possible issue that plugin will also change the list and items when updating view model
                     var resultsCopy = DeepCloneResults(e.Results, token);
@@ -1213,7 +1217,7 @@ private void QueryHistory()
 
         private async Task QueryResultsAsync(bool searchDelay, bool isReQuery = false, bool reSelect = true)
         {
-            _updateSource?.Cancel();
+            _updateSource.Cancel();
 
             App.API.LogDebug(ClassName, $"Start query with text: <{QueryText}>");
 
@@ -1239,15 +1243,17 @@ private async Task QueryResultsAsync(bool searchDelay, bool isReQuery = false, b
 
             App.API.LogDebug(ClassName, $"Start query with ActionKeyword <{query.ActionKeyword}> and RawQuery <{query.RawQuery}>");
 
+            _updateSource.Dispose();
             _updateSource = new CancellationTokenSource();
+            _updateToken = _updateSource.Token;
 
             ProgressBarVisibility = Visibility.Hidden;
             _isQueryRunning = true;
 
             // Switch to ThreadPool thread
             await TaskScheduler.Default;
 
-            if (_updateSource.Token.IsCancellationRequested) return;
+            if (_updateToken.IsCancellationRequested) return;
 
             // Update the query's IsReQuery property to true if this is a re-query
             query.IsReQuery = isReQuery;
@@ -1280,28 +1286,27 @@ private async Task QueryResultsAsync(bool searchDelay, bool isReQuery = false, b
             {
                 // Wait 15 millisecond for query change in global query
                 // if query changes, return so that it won't be calculated
-                await Task.Delay(15, _updateSource.Token);
-                if (_updateSource.Token.IsCancellationRequested)
-                    return;
+                await Task.Delay(15, _updateToken);
+                if (_updateToken.IsCancellationRequested) return;
             }*/
 
-            _ = Task.Delay(200, _updateSource.Token).ContinueWith(_ =>
+            _ = Task.Delay(200, _updateToken).ContinueWith(_ =>
                 {
                     // start the progress bar if query takes more than 200 ms and this is the current running query and it didn't finish yet
                     if (_isQueryRunning)
                     {
                         ProgressBarVisibility = Visibility.Visible;
                     }
                 },
-                _updateSource.Token,
+                _updateToken,
                 TaskContinuationOptions.NotOnCanceled,
                 TaskScheduler.Default);
 
             // plugins are ICollection, meaning LINQ will get the Count and preallocate Array
 
             var tasks = plugins.Select(plugin => plugin.Metadata.Disabled switch
             {
-                false => QueryTaskAsync(plugin, _updateSource.Token),
+                false => QueryTaskAsync(plugin, _updateToken),
                 true => Task.CompletedTask
             }).ToArray();
 
@@ -1315,13 +1320,13 @@ private async Task QueryResultsAsync(bool searchDelay, bool isReQuery = false, b
                 // nothing to do here
             }
 
-            if (_updateSource.Token.IsCancellationRequested) return;
+            if (_updateToken.IsCancellationRequested) return;
 
             // this should happen once after all queries are done so progress bar should continue
             // until the end of all querying
             _isQueryRunning = false;
 
-            if (!_updateSource.Token.IsCancellationRequested)
+            if (!_updateToken.IsCancellationRequested)
             {
                 // update to hidden if this is still the current query
                 ProgressBarVisibility = Visibility.Hidden;