fixed ui freeze using queue for passing status between worker and parent

1 files changed, 7 insertions, 1 deletions

diff --git a/src/leap/gui/threads.py b/src/leap/gui/threads.py
index 176c19b1..8aad8866 100644
--- a/src/leap/gui/threads.py
+++ b/src/leap/gui/threads.py
@@ -3,10 +3,16 @@ from PyQt4 import QtCore
 
 class FunThread(QtCore.QThread):
 
-    def __init__(self, fun, parent=None):
+    def __init__(self, fun=None, parent=None):
+
         QtCore.QThread.__init__(self, parent)
+        self.exiting = False
         self.fun = fun
 
+    def __del__(self):
+        self.exiting = True
+        self.wait()
+
     def run(self):
         if self.fun:
             self.fun()