diff options
| author | kali <kali@leap.se> | 2012-11-28 01:11:05 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2012-11-28 01:11:05 +0900 |
| commit | 16f19a225a922dd77f3f6c75c94194ebd229fc67 (patch) | |
| tree | d77ba10cdad970b5025e75daa2b3be24e35ce0c7 /src/leap/gui/threads.py | |
| parent | 862014f68fce37318f77309a8f8f9782dabc60d2 (diff) | |
| parent | 3ea766452e3c4708c724509d03001c0a0314fcf6 (diff) | |
Merge branch 'feature/wizard-usability' into develop
Diffstat (limited to 'src/leap/gui/threads.py')
| -rw-r--r-- | src/leap/gui/threads.py | 8 |
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() |