Better cleanup in on_quit. Still probably needs a revisit.

This commit is contained in:
Nick Foster 2012-10-10 09:00:54 -07:00
parent 0f38bfd0d7
commit 628003fbe6

View File

@ -296,18 +296,23 @@ class mainwindow(QtGui.QMainWindow):
def on_quit(self): def on_quit(self):
if self.runner is not None: if self.runner is not None:
self.output_handler.done = True try:
self.output_handler.done = True
except:
pass
self.output_handler = None self.output_handler = None
self.outputs = [] self.outputs = []
self.updates = [] self.updates = []
self.fg.stop() self.fg.stop()
self.runner = None self.runner = None
self.fg = None self.fg = None
if self.kmlgen is not None: try:
self.kmlgen.done = True self.kmlgen.done = True
#TODO FIXME need a way to kill kmlgen safely without delay #TODO FIXME need a way to kill kmlgen safely without delay
#self.kmlgen.join() #self.kmlgen.join()
#self.kmlgen = None #self.kmlgen = None
except:
pass
#slot to catch signal emitted by output_live_data (necessary for #slot to catch signal emitted by output_live_data (necessary for
#thread safety since output_live_data is called by another thread) #thread safety since output_live_data is called by another thread)