Merge remote-tracking branch 'refs/remotes/ivan/feature/autostart-on-linux' into develop

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.