Merge pull request #1161 from mono/cycle6-bug-29879-global-search-crash

[Ide] Fix crash in global search popup window.

1 files changed, 7 insertions, 0 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchPopupWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchPopupWindow.cs
index 7deca2de99..8cc4de95ca 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchPopupWindow.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchPopupWindow.cs
@@ -245,6 +245,7 @@ namespace MonoDevelop.Components.MainToolbar
 			if (incompleteResults.Count == categories.Count) {
 				results.Clear ();
 				results.AddRange (incompleteResults);
+				List<Tuple<SearchCategory, ISearchDataSource>> failedResults = null;
 				topItem = null;
 
 				for (int i = 0; i < results.Count; i++) {
@@ -256,11 +257,17 @@ namespace MonoDevelop.Components.MainToolbar
 							topItem = new ItemIdentifier(tuple.Item1, tuple.Item2, 0);
 					} catch (Exception e) {
 						LoggingService.LogError ("Error while showing result " + i, e);
+						if (failedResults == null)
+							failedResults = new List<Tuple<SearchCategory, ISearchDataSource>> ();
+						failedResults.Add (results [i]);
 						continue;
 					}
 				}
 				selectedItem = topItem;
 
+				if (failedResults != null)
+					failedResults.ForEach (failedResult => results.Remove (failedResult));
+
 				ShowTooltip ();
 				isInSearch = false;
 				AnimatedResize ();