summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2011-07-07 15:43:27 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-08 17:30:03 +0100
commit3412fbd6a16980e0fba7742c32675eea9d77d6c0 (patch)
tree0f12f68ed093743ec8cca53d67c75e55df9a6eb8 /lib
parent737d1bc819b192b4c2caa0482bddb6921b5aac93 (diff)
downloadbitbake-contrib-3412fbd6a16980e0fba7742c32675eea9d77d6c0.tar.gz
lib/bb/ui/hob: don't error when dismissing save as dialog
If the user decides to cancel the save as dialog we should not try and save regardless. Fixes [YOCTO #1220] Signed-off-by: Joshua Lock <josh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/bb/ui/hob.py20
1 files changed, 14 insertions, 6 deletions
diff --git a/lib/bb/ui/hob.py b/lib/bb/ui/hob.py
index 7647d2139..06d936e71 100644
--- a/lib/bb/ui/hob.py
+++ b/lib/bb/ui/hob.py
@@ -99,12 +99,15 @@ class MainWindow (gtk.Window):
dialog.add_buttons(gtk.STOCK_NO, gtk.RESPONSE_NO,
gtk.STOCK_YES, gtk.RESPONSE_YES)
resp = dialog.run()
+ dialog.destroy()
if resp == gtk.RESPONSE_YES:
if not self.save_path:
self.get_save_path()
- self.save_recipe_file()
- rep = self.model.get_build_rep()
- rep.writeRecipe(self.save_path, self.model)
+
+ if self.save_path:
+ self.save_recipe_file()
+ rep = self.model.get_build_rep()
+ rep.writeRecipe(self.save_path, self.model)
gtk.main_quit()
@@ -325,17 +328,22 @@ class MainWindow (gtk.Window):
chooser.set_current_name("myimage.bb")
response = chooser.run()
if response == gtk.RESPONSE_OK:
- self.save_path = chooser.get_filename()
+ save_path = chooser.get_filename()
+ else:
+ save_path = None
chooser.destroy()
+ self.save_path = save_path
def save_cb(self, action):
if not self.save_path:
self.get_save_path()
- self.save_recipe_file()
+ if self.save_path:
+ self.save_recipe_file()
def save_as_cb(self, action):
self.get_save_path()
- self.save_recipe_file()
+ if self.save_path:
+ self.save_recipe_file()
def open_cb(self, action):
chooser = gtk.FileChooserDialog(title=None, parent=self,