evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tidy up closedown

Browse Source
This commit is contained in:
sqlcoder 2010-07-13 21:23:32 +01:00
parent 6661610429
commit b07505d367
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pyfpdb/Database.py
View File

@ -521,6 +521,7 @@ class Database:
self.connection.commit() self.connection.commit()
self.cursor.close() self.cursor.close()
self.connection.close() self.connection.close()
self.__connected = False
def reconnect(self, due_to_error=False): def reconnect(self, due_to_error=False):
"""Reconnects the DB""" """Reconnects the DB"""

10
pyfpdb/fpdb.pyw
View File

@ -849,18 +849,21 @@ class fpdb:
def quit(self, widget, data=None): def quit(self, widget, data=None):
# 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?
#FIXME get two "quitting normally" messages, following the addition of the self.window.destroy() call #FIXME get two "quitting normally" messages, following the addition of the self.window.destroy() call
print "Quitting normally" # ... because self.window.destroy() leads to self.destroy() which calls this!
if not self.quitting:
print "Quitting normally"
self.quitting = True
# 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
if self.db!=None: if self.db!=None:
if self.db.backend==self.db.MYSQL_INNODB: if self.db.backend==self.db.MYSQL_INNODB:
try: 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 except _mysql_exceptions.OperationalError: # oh, damn, we're already disconnected
pass pass
else: else:
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()
else: else:
pass pass
@ -945,6 +948,7 @@ You can find the full license texts in agpl-3.0.txt, gpl-2.0.txt and gpl-3.0.txt
self.lock = interlocks.InterProcessLock(name="fpdb_global_lock") self.lock = interlocks.InterProcessLock(name="fpdb_global_lock")
self.db = None self.db = None
self.status_bar = None self.status_bar = None
self.quitting = False
self.window = gtk.Window(gtk.WINDOW_TOPLEVEL) self.window = gtk.Window(gtk.WINDOW_TOPLEVEL)
self.window.connect("delete_event", self.delete_event) self.window.connect("delete_event", self.delete_event)