From 5945a0313c8774a741a8bf77b82b96467ad8da3c Mon Sep 17 00:00:00 2001 From: duplo Date: Fri, 21 May 2010 14:35:52 +0000 Subject: [PATCH] Reload the module data every time the user enter into the module configuration page so that if the user has changed the cpu the right configuration is picked up. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@3784 38d2e660-2303-0410-9eaa-f027e97ec537 --- wizard/BModulePage.py | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/wizard/BModulePage.py b/wizard/BModulePage.py index ed5b6355..d42cbb61 100644 --- a/wizard/BModulePage.py +++ b/wizard/BModulePage.py @@ -219,18 +219,16 @@ class BModulePage(BWizardPage): """ Loads the module data. """ - # Load the module data only if it isn't already loaded - if not self.projectInfo("MODULES") \ - and not self.projectInfo("LISTS") \ - and not self.projectInfo("CONFIGURATIONS"): - try: - self.project.loadModuleData() - except ModuleDefineException, e: - self.exceptionOccurred(self.tr("Error parsing line '%2' in file %1").arg(e.path).arg(e.line)) - except EnumDefineException, e: - self.exceptionOccurred(self.tr("Error parsing line '%2' in file %1").arg(e.path).arg(e.line)) - except ConfigurationDefineException, e: - self.exceptionOccurred(self.tr("Error parsing line '%2' in file %1").arg(e.path).arg(e.line)) + # Load the module data every time so that if the user changed the cpu + # the right configurations are picked up. + try: + self.project.loadModuleData() + except ModuleDefineException, e: + self.exceptionOccurred(self.tr("Error parsing line '%2' in file %1").arg(e.path).arg(e.line)) + except EnumDefineException, e: + self.exceptionOccurred(self.tr("Error parsing line '%2' in file %1").arg(e.path).arg(e.line)) + except ConfigurationDefineException, e: + self.exceptionOccurred(self.tr("Error parsing line '%2' in file %1").arg(e.path).arg(e.line)) def fillModuleTree(self): """ -- 2.25.1