summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-06-23 15:35:50 -0300
committerTomás Touceda <chiiph@leap.se>2014-06-23 15:35:50 -0300
commita28566a7b4c999a7da8e0f6cf76d31a1065c8eed (patch)
tree56af0ad95284e45a7985a5149cd55ce5a2a2d783 /src/leap
parent6b4a4dc1efe5a3c740a9e54a22409d1025294537 (diff)
parent243cb6a282085414188d351aca547965191a32a2 (diff)
Merge remote-tracking branch 'refs/remotes/ivan/bug/fix-delay-usage' into develop
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/bitmask/gui/mainwindow.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 11b9acf1..5feaf610 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -88,7 +88,7 @@ class MainWindow(QtGui.QMainWindow):
EIP_START_TIMEOUT = 60000 # in milliseconds
# We give the services some time to a halt before forcing quit.
- SERVICES_STOP_TIMEOUT = 20
+ SERVICES_STOP_TIMEOUT = 20000 # in milliseconds
def __init__(self, bypass_checks=False, start_hidden=False):
"""
@@ -897,7 +897,7 @@ class MainWindow(QtGui.QMainWindow):
self.tr('Hello!'),
self.tr('Bitmask has started in the tray.'))
# we wait for the systray to be ready
- QtDelayedCall(1, hello)
+ QtDelayedCall(1000, hello)
@QtCore.Slot(int)
def _tray_activated(self, reason=None):
@@ -1780,4 +1780,4 @@ class MainWindow(QtGui.QMainWindow):
self._backend.stop()
self.close()
- QtDelayedCall(1, twisted_main.quit)
+ QtDelayedCall(100, twisted_main.quit)