Remember the previously selected toolchain when coming back from the module page.

[bertos.git] / wizard / BToolchainPage.py

diff --git a/wizard/BToolchainPage.py b/wizard/BToolchainPage.py
index 791a2f339d838f23871e527cf781f81bfc0b3751..ff1891ff70edb15244effd52a3d38069b37f3c3f 100644 (file)
--- a/wizard/BToolchainPage.py
+++ b/wizard/BToolchainPage.py
@@ -110,8 +110,8 @@ class BToolchainPage(BWizardPage):
         self._clearList()
         self.setupUi()
         self._populateToolchainList()
-        if len(self._valid_items) == 1:
-            self.pageContent.toolchainList.setCurrentItem(self._valid_items[0])
+        if len(self._valid_items) >= 1:
+            self.pageContent.toolchainList.setCurrentItem(self.pageContent.toolchainList.currentItem() or self._valid_items[0])
 
     ####
 
@@ -180,6 +180,7 @@ class BToolchainPage(BWizardPage):
         Fills the toolchain list with the toolchains stored in the QSettings.
         """
         self.pageContent.toolchainList.clear()
+        self._valid_items = []
         toolchains = self._toolchain_manager.predefined_toolchains + self._toolchain_manager.toolchains
         sel_toolchain = self.projectInfo("TOOLCHAIN")
         for key, value in toolchains: