summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCristiana Voicu <cristiana.voicu@intel.com>2013-08-27 13:27:37 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-27 11:47:19 +0100
commitf8166ace0bd9155199166990ce15da24eb2e793b (patch)
tree04d617b9a9b908b03f0a6446ec6c76ea7d60cc8f
parent715aed74f972bb6e9b6a5130ca9ede48d4f79f0a (diff)
downloadbitbake-f8166ace0bd9155199166990ce15da24eb2e793b.tar.gz
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] Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/ui/crumbs/imageconfigurationpage.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/bb/ui/crumbs/imageconfigurationpage.py b/lib/bb/ui/crumbs/imageconfigurationpage.py
index ca168bc49..060fee241 100644
--- a/lib/bb/ui/crumbs/imageconfigurationpage.py
+++ b/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)