Skip to content

Commit 7f4ab6d

Browse files
committed
ProjectManager improvements:
- Disable and clear TargetBuildSelector text only on project close - Restore last TargetBuild for all project types
1 parent daba1cc commit 7f4ab6d

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

External/Plugins/ProjectManager/Controls/FDMenus.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,12 @@ public void SetProject(Project project)
121121
ProjectChanged(project);
122122
}
123123

124+
public void CloseProject()
125+
{
126+
TargetBuildSelector.Text = "";
127+
EnableTargetBuildSelector(false);
128+
}
129+
124130
public void ProjectChanged(Project project)
125131
{
126132
TargetBuildSelector.Items.Clear();
@@ -130,20 +136,14 @@ public void ProjectChanged(Project project)
130136
string target = project.TargetBuild ?? project.MovieOptions.TargetBuildTypes[0];
131137
if (target != "" && !TargetBuildSelector.Items.Contains(target)) TargetBuildSelector.Items.Insert(0, target);
132138
TargetBuildSelector.Text = target;
133-
EnableTargetBuildSelector(true);
134139
}
135-
else if (project.OutputType == OutputType.CustomBuild)
140+
else
136141
{
137142
string target = project.TargetBuild ?? "";
138143
if (target != "") TargetBuildSelector.Items.Insert(0, target);
139144
TargetBuildSelector.Text = target;
140-
EnableTargetBuildSelector(true);
141-
}
142-
else
143-
{
144-
TargetBuildSelector.Text = "";
145-
EnableTargetBuildSelector(false);
146145
}
146+
EnableTargetBuildSelector(true);
147147
}
148148

149149

External/Plugins/ProjectManager/PluginMain.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -694,8 +694,12 @@ void CloseProject(bool internalClosing)
694694
prefs.ExpandedPaths = Tree.ExpandedPaths;
695695
prefs.DebugMode = project.TraceEnabled;
696696
prefs.TargetBuild = project.TargetBuild;
697-
698-
if (!PluginBase.MainForm.ClosingEntirely) SaveProjectSession();
697+
698+
if (!PluginBase.MainForm.ClosingEntirely)
699+
{
700+
SaveProjectSession();
701+
menus.CloseProject();
702+
}
699703

700704
activeProject = null;
701705
if (projectResources != null)

0 commit comments

Comments
 (0)