2 files changed, 16 insertions, 1 deletions
diff --git a/src/leap/gui/progress.py b/src/leap/gui/progress.py
index 2b1b40d9..6e8abc1f 100644
--- a/src/leap/gui/progress.py
+++ b/src/leap/gui/progress.py
@@ -13,7 +13,7 @@ import logging
 from PyQt4 import QtCore
 from PyQt4 import QtGui
 
-from leap.baseapp.mainwindow import FunThread
+from leap.gui.threads import FunThread
 
 from leap.gui import mainwindow_rc
 
diff --git a/src/leap/gui/threads.py b/src/leap/gui/threads.py
new file mode 100644
index 00000000..176c19b1
--- /dev/null
+++ b/src/leap/gui/threads.py
@@ -0,0 +1,15 @@
+from PyQt4 import QtCore
+
+
+class FunThread(QtCore.QThread):
+
+    def __init__(self, fun, parent=None):
+        QtCore.QThread.__init__(self, parent)
+        self.fun = fun
+
+    def run(self):
+        if self.fun:
+            self.fun()
+
+    def begin(self):
+        self.start()