X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=wizard%2FBRoutePage.py;h=2646cab23869e584d38a2a3ee34ba7eb5e73c8d9;hb=39279a8f7a3c0aa7c0dc2f56863e088568044d79;hp=b34f790050986e74fab5d39588993afa6c341478;hpb=67d2aeb4d61b3843ed2fbac9ced64ffb76059c50;p=bertos.git

diff --git a/wizard/BRoutePage.py b/wizard/BRoutePage.py
index b34f7900..2646cab2 100644
--- a/wizard/BRoutePage.py
+++ b/wizard/BRoutePage.py
@@ -62,7 +62,6 @@ class BRoutePage(BWizardPage):
         """
         Overload of the QWizardPage isComplete method.
         """
-        self.setProjectInfo("EMPTY_MAIN", self.empty_main)
         self.setProjectInfo("BASE_MODE", not self.advanced)
         return True
 
@@ -78,18 +77,23 @@ class BRoutePage(BWizardPage):
             cpu_info = self.projectInfo("CPU_INFOS")
             if cpu_info:
                 target = cpu_info["TOOLCHAIN"]
+                # Try to find a suitable toolchain automatically
+                tm = ToolchainManager()
+                suitable_toolchains = tm.suitableToolchains(target)
+                if len(suitable_toolchains) == 1:
+                    toolchain = suitable_toolchains.pop()
+                    toolchain_info = tm._validateToolchain(toolchain)
+                    toolchain_info["path"] = toolchain
+                    self.setProjectInfo("TOOLCHAIN", toolchain_info)
+                    return self.wizard().pageIndex(BOutputPage)
+                else:
+                    return self.wizard().pageIndex(BToolchainPage)
             else:
                 # It seems that the nextId method is called before the
                 # reloadData one (that is called after the page changing.
                 #
                 # TODO: fix this awful code lines
                 target = None
-            # Try to find a suitable toolchain automatically
-            tm = ToolchainManager()
-            suitable_toolchains = tm.suitableToolchains(target)
-            if len(suitable_toolchains) == 1:
-                return self.wizard().pageIndex(BOutputPage)
-            else:
                 return self.wizard().pageIndex(BToolchainPage)
 
     ####
@@ -106,7 +110,6 @@ class BRoutePage(BWizardPage):
         """
         Overload of the BWizardPage connectSignals method.
         """
-        self.connect(self.pageContent.emptyCheckBox, SIGNAL("stateChanged(int)"), self, SIGNAL("completeChanged()"))
         self.connect(self.pageContent.baseButton, SIGNAL("toggled(bool)"), self, SIGNAL("completeChanged()"))
 
     def reloadData(self):