mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Bug # 192810

Browse source
This commit is contained in:
Oleg Krasilnikov 2007-09-12 14:06:24 +00:00
parent 27051c284a
commit cca2b142b4
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CDTConfigWizardPage.java
View file

@ -111,7 +111,7 @@ public class CDTConfigWizardPage extends WizardPage {
public CfgHolder[] getCfgItems(boolean getDefault) { public CfgHolder[] getCfgItems(boolean getDefault) {
CfgHolder[] its; CfgHolder[] its;
if (getDefault || table == null) if (getDefault || table == null || !isVisited())
its = getDefaultCfgs(handler); its = getDefaultCfgs(handler);
else { else {
ArrayList out = new ArrayList(table.getItemCount()); ArrayList out = new ArrayList(table.getItemCount());

8
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java
View file

@ -400,14 +400,10 @@ public class MBSWizardHandler extends CWizardHandler {
ICProjectDescriptionManager mngr = CoreModel.getDefault().getProjectDescriptionManager(); ICProjectDescriptionManager mngr = CoreModel.getDefault().getProjectDescriptionManager();
ICProjectDescription des = mngr.createProjectDescription(project, false, !onFinish); ICProjectDescription des = mngr.createProjectDescription(project, false, !onFinish);
ManagedBuildInfo info = ManagedBuildManager.createBuildInfo(project); ManagedBuildInfo info = ManagedBuildManager.createBuildInfo(project);
if (defaults) {
cfgs = CDTConfigWizardPage.getDefaultCfgs(this); cfgs = fConfigPage.getCfgItems(false);
} else {
getConfigPage(); // ensure that page is created
cfgs = fConfigPage.getCfgItems(defaults);
if (cfgs == null || cfgs.length == 0) if (cfgs == null || cfgs.length == 0)
cfgs = CDTConfigWizardPage.getDefaultCfgs(this); cfgs = CDTConfigWizardPage.getDefaultCfgs(this);
}
if (cfgs == null || cfgs.length == 0 || cfgs[0].getConfiguration() == null) { if (cfgs == null || cfgs.length == 0 || cfgs[0].getConfiguration() == null) {
throw new CoreException(new Status(IStatus.ERROR, throw new CoreException(new Status(IStatus.ERROR,