Merge pull request #867 from fdorg/fix/targetbuild_clear

Prevent occasional loss of target build value when building

Author: elsassph

External/Plugins/ProjectManager/Controls/FDMenus.cs

@@ -98,7 +98,9 @@ public FDMenus(IMainForm mainForm)
 
         public void EnableTargetBuildSelector(bool enabled)
         {
+            var target = TargetBuildSelector.Text; // prevent occasional loss of value when the control is disabled
             TargetBuildSelector.Enabled = enabled;
+            TargetBuildSelector.Text = target;
         }
 
         public bool DisabledForBuild
@@ -139,18 +141,26 @@ public void ProjectChanged(Project project)
             {
                 TargetBuildSelector.Items.AddRange(project.MovieOptions.TargetBuildTypes);
                 string target = project.TargetBuild ?? project.MovieOptions.TargetBuildTypes[0];
-                if (!String.IsNullOrEmpty(target) && !TargetBuildSelector.Items.Contains(target)) TargetBuildSelector.Items.Insert(0, target);
+                AddTargetBuild(target);
                 TargetBuildSelector.Text = target;
             }
             else
             {
                 string target = project.TargetBuild ?? "";
-                if (target != "") TargetBuildSelector.Items.Insert(0, target);
+                AddTargetBuild(target);
                 TargetBuildSelector.Text = target;
             }
             EnableTargetBuildSelector(true);
         }
 
+        internal void AddTargetBuild(string target)
+        {
+            if (target == null) return;
+            target = target.Trim();
+            if (target.Length > 0 && !TargetBuildSelector.Items.Contains(target)) 
+                TargetBuildSelector.Items.Insert(0, target);
+        }
+
 
         public void ToggleDebugRelease()
         {

External/Plugins/ProjectManager/PluginMain.cs

@@ -320,8 +320,7 @@ private void ApplyTargetBuild()
             Project project = activeProject;
             if (project != null && project.TargetBuild != target)
             {
-                if (!menus.TargetBuildSelector.Items.Contains(target))
-                    menus.TargetBuildSelector.Items.Insert(0, target);
+                menus.AddTargetBuild(target);
                 FlexCompilerShell.Cleanup();
                 project.TargetBuild = menus.TargetBuildSelector.Text;
                 project.UpdateVars(false);