X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBRoutePage.py;h=5b48a1745291be41c5f4d2e686d5fc2a159dc211;hb=9add062a61029071c38f672621d89177d71f3b59;hp=b34f790050986e74fab5d39588993afa6c341478;hpb=67d2aeb4d61b3843ed2fbac9ced64ffb76059c50;p=bertos.git

diff --git a/wizard/BRoutePage.py b/wizard/BRoutePage.py
index b34f7900..5b48a174 100644
--- a/wizard/BRoutePage.py
+++ b/wizard/BRoutePage.py
@@ -78,18 +78,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)
 
     ####