When an image from scratch is selected, and recipes parsing
is canceled, the image shown by the combo box isn't correct.
[YOCTO #5000]
Signed-off-by: Cristiana Voicu <cristiana.voicu at intel.com>
---
bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
index ca168bc..060fee2 100644
--- a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
+++ b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
@@ -496,16 +496,15 @@ class ImageConfigurationPage (HobPage):
cnt = cnt + 1
self.image_combo.append_text(self.builder.recipe_model.__custom_image__)
+ if selected_image == self.builder.recipe_model.__custom_image__:
+ active = cnt
+
if self.custom_image_selected:
self.image_combo.append_text("--Separator--")
- cnt = cnt + 1
self.image_combo.append_text(self.custom_image_selected)
+ cnt = cnt + 2
if self.custom_image_selected == selected_image:
active = cnt
- cnt = cnt + 1
-
- if selected_image == self.builder.recipe_model.__custom_image__:
- active = cnt
self.image_combo.set_active(active)
--
1.7.9.5