From d50bfaa9a122040b0df9f1e237b294716ec66be7 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Fri, 5 Aug 2011 17:13:21 -0700 Subject: bb/ui/hob: move some code around to avert a race The data-generated and model-updated signals are different, the model should only be accessed *after* the model-updated signal. Move code setting the image combo's backing model to the model-updated callback to ensure the combo is accurately set when changing the machine with an image selected. (Bitbake rev: 46953d3b4595667935d43fe7b20264ae0efd1bdf) Signed-off-by: Joshua Lock Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/hob.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'bitbake/lib') diff --git a/bitbake/lib/bb/ui/hob.py b/bitbake/lib/bb/ui/hob.py index 5906251f41..e0427658d9 100644 --- a/bitbake/lib/bb/ui/hob.py +++ b/bitbake/lib/bb/ui/hob.py @@ -183,13 +183,6 @@ class MainWindow (gtk.Window): def data_generated(self, handler): self.generating = False - self.image_combo.set_model(self.model.images_model()) - # Without this the image combo is incorrectly sized on first load of the GUI - self.image_combo.set_active(0) - self.image_combo.set_active(-1) - - if not self.image_combo_id: - self.image_combo_id = self.image_combo.connect("changed", self.image_changed_cb) self.enable_widgets() def machine_combo_changed_cb(self, combo, handler): @@ -286,6 +279,14 @@ class MainWindow (gtk.Window): pkgsaz_model.set_default_sort_func(None) self.pkgsaz_tree.set_model(pkgsaz_model) + self.image_combo.set_model(self.model.images_model()) + # Without this the image combo is incorrectly sized on first load of the GUI + self.image_combo.set_active(0) + self.image_combo.set_active(-1) + + if not self.image_combo_id: + self.image_combo_id = self.image_combo.connect("changed", self.image_changed_cb) + # We want the contents to be alphabetised so create a TreeModelSort to # use in the view contents_model = gtk.TreeModelSort(self.model.contents_model()) -- cgit v1.2.3-54-g00ecf