Merge branch 'master' of git://git.assembla.com/fpdb-eric.git

This commit is contained in:
Gerko de Roo 2010-02-07 11:09:16 +01:00
commit 3f061c758a

View File

@ -796,8 +796,11 @@ class fpdb:
# TODO: can we get some / all of the stuff done in this function to execute on any kind of abort? # TODO: can we get some / all of the stuff done in this function to execute on any kind of abort?
print "Quitting normally" print "Quitting normally"
# TODO: check if current settings differ from profile, if so offer to save or abort # TODO: check if current settings differ from profile, if so offer to save or abort
try:
if self.db is not None and self.db.connected: if self.db is not None and self.db.connected:
self.db.disconnect() self.db.disconnect()
except _mysql_exceptions.OperationalError: # oh, damn, we're already disconnected
pass
self.statusIcon.set_visible(False) self.statusIcon.set_visible(False)
gtk.main_quit() gtk.main_quit()