Bug 45066 - Automatic selected 'Default' in device dropdown list when select Release mode from configuration.

1 files changed, 6 insertions, 5 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 8c1f529b54..4df4280ef1 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarController.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbarController.cs
@@ -190,18 +190,18 @@ namespace MonoDevelop.Components.MainToolbar
 				int runtimes = 0;
 				if (currentSolution.StartupConfiguration is MultiItemSolutionRunConfiguration) {
 					bool anyValid = false;
-					foreach (var startConf in ((MultiItemSolutionRunConfiguration)currentSolution.StartupConfiguration).Items.Select (i => i.RunConfiguration)) {
-						if (startConf == null || startConf.ParentItem == null)
+					foreach (var startConf in ((MultiItemSolutionRunConfiguration)currentSolution.StartupConfiguration).Items) {
+						if (startConf?.SolutionItem == null)
 							continue;
 
 						// Check that the current startup project is enabled for the current configuration
 						var solConf = currentSolution.GetConfiguration (IdeApp.Workspace.ActiveConfiguration);
-						if (solConf == null || !solConf.BuildEnabledForItem (startConf.ParentItem))
+						if (solConf == null || !solConf.BuildEnabledForItem (startConf.SolutionItem))
 							continue;
 						anyValid = true;
 						var projectList = new List<RuntimeModel> ();
-						FillRuntimesForProject (projectList, startConf.ParentItem, ref runtimes);
-						var parent = new RuntimeModel (this, startConf.ParentItem.Name);
+						FillRuntimesForProject (projectList, startConf.SolutionItem, ref runtimes);
+						var parent = new RuntimeModel (this, startConf.SolutionItem.Name);
 						parent.HasChildren = true;
 						list.Add (parent);
 						foreach (var p in projectList) {
@@ -366,6 +366,7 @@ namespace MonoDevelop.Components.MainToolbar
 			UpdateBuildConfiguration ();
 
 			FillRuntimes ();
+			SelectActiveRuntime (ToolbarView.ActiveRuntime as RuntimeModel);
 		}
 
 		void NotifyRunConfigurationChange ()