- DefaultBuildTargets is now preferred over TargetBuildTypes if both are used

- Now only whitespace around commas are stripped in DefaultBuildTargets

Author: Meychi

External/Plugins/ProjectManager/Controls/FDMenus.cs

@@ -130,18 +130,18 @@ public void CloseProject()
         public void ProjectChanged(Project project)
         {
             TargetBuildSelector.Items.Clear();
-            if (project.MovieOptions.TargetBuildTypes != null)
+            if (project.MovieOptions.DefaultBuildTargets != null && project.MovieOptions.DefaultBuildTargets.Length > 0)
+            {
+                TargetBuildSelector.Items.AddRange(project.MovieOptions.DefaultBuildTargets);
+                TargetBuildSelector.Text = project.MovieOptions.DefaultBuildTargets[0];
+            }
+            else if (project.MovieOptions.TargetBuildTypes != null && project.MovieOptions.TargetBuildTypes.Length > 0)
             {
                 TargetBuildSelector.Items.AddRange(project.MovieOptions.TargetBuildTypes);
                 string target = project.TargetBuild ?? project.MovieOptions.TargetBuildTypes[0];
-                if (target != "" && !TargetBuildSelector.Items.Contains(target)) TargetBuildSelector.Items.Insert(0, target);
+                if (!String.IsNullOrEmpty(target) && !TargetBuildSelector.Items.Contains(target)) TargetBuildSelector.Items.Insert(0, target);
                 TargetBuildSelector.Text = target;
             }
-            else if (project.MovieOptions.DefaultBuildTargets != null && project.MovieOptions.DefaultBuildTargets.Length > 0)
-            {
-                TargetBuildSelector.Items.AddRange(project.MovieOptions.DefaultBuildTargets);
-                TargetBuildSelector.Text = project.MovieOptions.DefaultBuildTargets[0];
-            }
             else
             {
                 string target = project.TargetBuild ?? "";

External/Plugins/ProjectManager/Projects/ProjectReader.cs

@@ -189,8 +189,8 @@ public void ReadProjectOptions()
                     case "defaultBuildTargets":
                         if (!String.IsNullOrEmpty(Value.Trim()) && Value.IndexOf(",") > -1)
                         {
-                            String trimmed = new String(Value.Where(c => !Char.IsWhiteSpace(c)).ToArray());
-                            project.MovieOptions.DefaultBuildTargets = trimmed.Split(',');
+                            String[] cleaned = Value.Trim().Split(',').Select(x => x.Trim()).ToArray<String>();
+                            project.MovieOptions.DefaultBuildTargets = cleaned;
                         }
                         break;