bitbake: hob: fixes for image combo box

When an image from scratch is selected, and recipes parsing
is canceled, the image shown by the combo box isn't correct.

[YOCTO #5000]
(Bitbake rev: f8166ace0bd9155199166990ce15da24eb2e793b)

Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
index ca168bc..060fee2 100644 (file)
--- 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)