Revert fix in MainViewModel & Fix possible issue in WebSearch plugin

Flow-Launcher · Dec 8, 2024 · 9a7c08b · 9a7c08b
1 parent 0c43ea9
commit 9a7c08b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 23 deletions.
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -1447,35 +1447,26 @@ public void UpdateResultView(ICollection<ResultsForUpdate> resultsForUpdates)
             }
 #endif
 
-            try
+            foreach (var metaResults in resultsForUpdates)
             {
-                foreach (var metaResults in resultsForUpdates)
+                foreach (var result in metaResults.Results)
                 {
-                    foreach (var result in metaResults.Results)
+                    if (_topMostRecord.IsTopMost(result))
                     {
-                        if (_topMostRecord.IsTopMost(result))
-                        {
-                            result.Score = int.MaxValue;
-                        }
-                        else
-                        {
-                            var priorityScore = metaResults.Metadata.Priority * 150;
-                            result.Score += _userSelectedRecord.GetSelectedCount(result) + priorityScore;
-                        }
+                        result.Score = int.MaxValue;
+                    }
+                    else
+                    {
+                        var priorityScore = metaResults.Metadata.Priority * 150;
+                        result.Score += _userSelectedRecord.GetSelectedCount(result) + priorityScore;
                     }
                 }
+            }
 
-                // it should be the same for all results
-                bool reSelect = resultsForUpdates.First().ReSelectFirstResult;
+            // it should be the same for all results
+            bool reSelect = resultsForUpdates.First().ReSelectFirstResult;
 
-                Results.AddResults(resultsForUpdates, token, reSelect);
-            }
-            catch (InvalidOperationException e)
-            {
-                // Plugin with IResultUpdate interface can somtimes throw this exception
-                // Collection was modified; enumeration operation may not execute
-                Log.Exception($"{nameof(MainViewModel)}.{nameof(UpdateResultView)}|UpdateResultView failed", e);
-            }
+            Results.AddResults(resultsForUpdates, token, reSelect);
         }
 
         #endregion

diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/Main.cs b/Plugins/Flow.Launcher.Plugin.WebSearch/Main.cs
@@ -85,7 +85,7 @@ public async Task<List<Result>> QueryAsync(Query query, CancellationToken token)
 
                 ResultsUpdated?.Invoke(this, new ResultUpdatedEventArgs
                 {
-                    Results = results,
+                    Results = results.ToList(),
                     Query = query
                 });