Fix Organize Tag editor for exception on 'x' close (#570)

Fix Organize Tags editor for exception on 'x' close
This commit is contained in:
Paul Culley 2018-03-04 21:18:51 -06:00 committed by Sam Manzi
parent 8fc8668921
commit 7180806afd

View File

@ -327,7 +327,6 @@ class OrganizeTagsDialog(ManagedWindow):
self.setup_configs('interface.organizetagsdialog', 400, 350) self.setup_configs('interface.organizetagsdialog', 400, 350)
self.show() self.show()
self.run() self.run()
self.close()
# this is meaningless while it's modal, but since this ManagedWindow can # this is meaningless while it's modal, but since this ManagedWindow can
# have an EditTag ManagedWindow child it needs a non-None second argument # have an EditTag ManagedWindow child it needs a non-None second argument
@ -350,9 +349,11 @@ class OrganizeTagsDialog(ManagedWindow):
break break
# Save changed priority values # Save changed priority values
if self.__priorities_changed(): if response == Gtk.ResponseType.CLOSE and self.__priorities_changed():
with DbTxn(_('Change Tag Priority'), self.db) as trans: with DbTxn(_('Change Tag Priority'), self.db) as trans:
self.__change_tag_priority(trans) self.__change_tag_priority(trans)
if response != Gtk.ResponseType.DELETE_EVENT:
self.close()
def __priorities_changed(self): def __priorities_changed(self):
""" """
@ -567,7 +568,6 @@ class EditTag(ManagedWindow):
self.setup_configs('interface.edittag', 320, 100) self.setup_configs('interface.edittag', 320, 100)
self.show() self.show()
self.run() self.run()
self.close()
def build_menu_names(self, obj): # this is meaningless while it's modal def build_menu_names(self, obj): # this is meaningless while it's modal
return (self.title, None) return (self.title, None)
@ -588,6 +588,8 @@ class EditTag(ManagedWindow):
if response == Gtk.ResponseType.OK: if response == Gtk.ResponseType.OK:
self._save() self._save()
if response != Gtk.ResponseType.DELETE_EVENT:
self.close()
def _save(self): def _save(self):
""" """