Merge remote-tracking branch 'origin/release-8.4' into release-8.4-a11y

1 files changed, 10 insertions, 0 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarController.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarController.cs
index a9763a1510..62986247a3 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarController.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarController.cs
@@ -574,6 +574,7 @@ namespace MonoDevelop.Components.MainToolbar
 				currentSolution.StartupConfigurationChanged -= HandleStartupItemChanged;
 				currentSolution.Saved -= HandleSolutionSaved;
 				currentSolution.EntrySaved -= HandleSolutionEntrySaved;
+				currentSolution.SolutionItemAdded -= HandleSolutionItemAdded;
 			}
 
 			currentSolution = e.Solution;
@@ -582,6 +583,7 @@ namespace MonoDevelop.Components.MainToolbar
 				currentSolution.StartupConfigurationChanged += HandleStartupItemChanged;
 				currentSolution.Saved += HandleSolutionSaved;
 				currentSolution.EntrySaved += HandleSolutionEntrySaved;
+				currentSolution.SolutionItemAdded += HandleSolutionItemAdded;
 			}
 
 			TrackStartupProject ();
@@ -624,6 +626,14 @@ namespace MonoDevelop.Components.MainToolbar
 				HandleSolutionSaved (sender, e);
 		}
 
+		void HandleSolutionItemAdded (object sender, SolutionItemChangeEventArgs e)
+		{
+			// When a solution item is added due to a reload we need to ensure the configurationMergers dictionary is
+			// using the new project and not the old disposed project.
+			if (e.Reloading)
+				UpdateCombos ();
+		}
+
 		void HandleStartupItemChanged (object sender, EventArgs e)
 		{
 			TrackStartupProject ();