From eec600d930545e101b80073c7a51f4c796bfca0b Mon Sep 17 00:00:00 2001
From: kudzu_cp <6d05c8c8ef5431987001abfdb2eadc9593ac9498>
Date: Mon, 26 Jul 2010 01:52:42 +0000
Subject: [PATCH]

---
 source2/VSIP/Cosmos.VS.Package/BuildPage.cs | 19 +++++++++++++------
 source2/VSIP/Cosmos.VS.Package/VMPage.cs    |  9 +++------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/source2/VSIP/Cosmos.VS.Package/BuildPage.cs b/source2/VSIP/Cosmos.VS.Package/BuildPage.cs
index 6c234dda2..912200f8a 100644
--- a/source2/VSIP/Cosmos.VS.Package/BuildPage.cs
+++ b/source2/VSIP/Cosmos.VS.Package/BuildPage.cs
@@ -41,8 +41,8 @@ namespace Cosmos.VS.Package {
                     mProps.Target = value;
 					IsDirty = true;
 
-					BuildPage.CurrentBuildTarget = value;
-					BuildPage.OnBuildTargetChanged(this, EventArgs.Empty);
+					CurrentBuildTarget = value;
+					OnBuildTargetChanged(this, EventArgs.Empty);
 				}
 			};
 
@@ -73,14 +73,21 @@ namespace Cosmos.VS.Package {
 			base.FillProperties();
 
             mProps.Reset();
+            
             mProps.SetProperty("OutputPath", GetConfigProperty("OutputPath"));
-            mProps.SetProperty("BuildTarget", GetConfigProperty("BuildTarget"));
-            mProps.SetProperty("Framework", GetConfigProperty("Framework"));
-            mProps.SetProperty("UseInternalAssembler", GetConfigProperty("UseInternalAssembler"));
-
             textOutputPath.Text = mProps.OutputPath;
+
+            mProps.SetProperty("BuildTarget", GetConfigProperty("BuildTarget"));
             comboTarget.SelectedItem = EnumValue.Find(comboTarget.Items, mProps.Target);
+            // We need to manually trigger it once, because the indexchanged event compares
+            // it against the source, and they will of course be the same.
+            CurrentBuildTarget = (TargetHost)((EnumValue)comboTarget.SelectedItem).Value;
+            OnBuildTargetChanged(this, EventArgs.Empty);
+
+            mProps.SetProperty("Framework", GetConfigProperty("Framework"));
             comboFramework.SelectedItem = EnumValue.Find(comboFramework.Items, mProps.Framework);
+
+            mProps.SetProperty("UseInternalAssembler", GetConfigProperty("UseInternalAssembler"));
             checkUseInternalAssembler.Checked = mProps.UseInternalAssembler;
 		}
 
diff --git a/source2/VSIP/Cosmos.VS.Package/VMPage.cs b/source2/VSIP/Cosmos.VS.Package/VMPage.cs
index 4e282c45b..e09e87156 100644
--- a/source2/VSIP/Cosmos.VS.Package/VMPage.cs
+++ b/source2/VSIP/Cosmos.VS.Package/VMPage.cs
@@ -9,11 +9,9 @@ using System.Windows.Forms;
 using System.Runtime.InteropServices;
 using Cosmos.Build.Common;
 
-namespace Cosmos.VS.Package
-{
+namespace Cosmos.VS.Package {
 	[Guid(Guids.VMPage)]
-	public partial class VMPage : ConfigurationBase
-	{
+	public partial class VMPage : ConfigurationBase {
 		private SubPropertyPageBase pageSubPage;
 
 		public VMPage() {
@@ -21,8 +19,7 @@ namespace Cosmos.VS.Package
 			BuildPage.BuildTargetChanged += new EventHandler(BuildOptionsPropertyPage_BuildTargetChanged);
         }
 
-		protected override void Dispose(bool disposing)
-		{
+		protected override void Dispose(bool disposing) {
 			if (disposing && (components != null))
 			{
 				components.Dispose();