summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/gui/mainwindow.py
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-07-25 11:36:32 -0300
committerTomás Touceda <chiiph@leap.se>2014-07-25 11:36:32 -0300
commitac2d0506fff21e30a3e072b85097938322da15ea (patch)
treeb33017a924817509f376f10e634bcc2a97f40395 /src/leap/bitmask/gui/mainwindow.py
parentdab3aea7281ecd473db2f4830c2bec0b3ccaa536 (diff)
parent28553c41c3d879481923102a1b41ecd71641d0d8 (diff)
Merge remote-tracking branch 'refs/remotes/ivan/feature/autostart-on-linux' into develop
Diffstat (limited to 'src/leap/bitmask/gui/mainwindow.py')
-rw-r--r--src/leap/bitmask/gui/mainwindow.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 383f97bb..2f78fd14 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -58,7 +58,7 @@ from leap.bitmask.services.mail import conductor as mail_conductor
from leap.bitmask.services import EIP_SERVICE, MX_SERVICE
-from leap.bitmask.util import make_address
+from leap.bitmask.util import autostart, make_address
from leap.bitmask.util.keyring_helpers import has_keyring
from leap.bitmask.logs.leap_log_handler import LeapLogHandler
@@ -108,6 +108,7 @@ class MainWindow(QtGui.QMainWindow):
:type start_hidden: bool
"""
QtGui.QMainWindow.__init__(self)
+ autostart.set_autostart(True)
# register leap events ########################################
register(signal=proto.UPDATER_NEW_UPDATES,
@@ -1797,6 +1798,8 @@ class MainWindow(QtGui.QMainWindow):
if self._quitting:
return
+ autostart.set_autostart(False)
+
self._quitting = True
# first thing to do quitting, hide the mainwindow and show tooltip.