From cca2b142b41b1b7b8baa26fbc8abd54c2d5c905b Mon Sep 17 00:00:00 2001 From: Oleg Krasilnikov Date: Wed, 12 Sep 2007 14:06:24 +0000 Subject: [PATCH] Bug # 192810 --- .../managedbuilder/ui/wizards/CDTConfigWizardPage.java | 2 +- .../managedbuilder/ui/wizards/MBSWizardHandler.java | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CDTConfigWizardPage.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CDTConfigWizardPage.java index cd0c3b25339..e0765aee667 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CDTConfigWizardPage.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CDTConfigWizardPage.java @@ -111,7 +111,7 @@ public class CDTConfigWizardPage extends WizardPage { public CfgHolder[] getCfgItems(boolean getDefault) { CfgHolder[] its; - if (getDefault || table == null) + if (getDefault || table == null || !isVisited()) its = getDefaultCfgs(handler); else { ArrayList out = new ArrayList(table.getItemCount()); diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java index d83d9bc8cd2..30abeca3511 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java @@ -400,14 +400,10 @@ public class MBSWizardHandler extends CWizardHandler { ICProjectDescriptionManager mngr = CoreModel.getDefault().getProjectDescriptionManager(); ICProjectDescription des = mngr.createProjectDescription(project, false, !onFinish); ManagedBuildInfo info = ManagedBuildManager.createBuildInfo(project); - if (defaults) { + + cfgs = fConfigPage.getCfgItems(false); + if (cfgs == null || cfgs.length == 0) cfgs = CDTConfigWizardPage.getDefaultCfgs(this); - } else { - getConfigPage(); // ensure that page is created - cfgs = fConfigPage.getCfgItems(defaults); - if (cfgs == null || cfgs.length == 0) - cfgs = CDTConfigWizardPage.getDefaultCfgs(this); - } if (cfgs == null || cfgs.length == 0 || cfgs[0].getConfiguration() == null) { throw new CoreException(new Status(IStatus.ERROR,