From 1472b9ebff22e11b364bb380b44f5a7ff6667331 Mon Sep 17 00:00:00 2001 From: Cristiana Voicu Date: Tue, 27 Aug 2013 13:27:37 +0300 Subject: [PATCH] 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 Signed-off-by: Richard Purdie --- .../lib/bb/ui/crumbs/imageconfigurationpage.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py index ca168bc49f..060fee241e 100644 --- a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py +++ b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py @@ -496,17 +496,16 @@ class ImageConfigurationPage (HobPage): cnt = cnt + 1 self.image_combo.append_text(self.builder.recipe_model.__custom_image__) - if self.custom_image_selected: - self.image_combo.append_text("--Separator--") - cnt = cnt + 1 - self.image_combo.append_text(self.custom_image_selected) - if self.custom_image_selected == selected_image: - active = cnt - cnt = cnt + 1 - if selected_image == self.builder.recipe_model.__custom_image__: active = cnt + if self.custom_image_selected: + self.image_combo.append_text("--Separator--") + self.image_combo.append_text(self.custom_image_selected) + cnt = cnt + 2 + if self.custom_image_selected == selected_image: + active = cnt + self.image_combo.set_active(active) if active != 0: