From 628003fbe658b4b253881a6a7263ca1370b32c31 Mon Sep 17 00:00:00 2001
From: Nick Foster <nick@ettus.com>
Date: Wed, 10 Oct 2012 09:00:54 -0700
Subject: [PATCH] Better cleanup in on_quit. Still probably needs a revisit.

---
 apps/modes_gui | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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