diff options
| author | kali <kali@leap.se> | 2013-03-26 02:27:33 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2013-03-26 02:27:33 +0900 |
| commit | d8ed08649d8337c1b5de8ae1e87a71435f3505f0 (patch) | |
| tree | 015593af31ab422984ef47f859efef4c81c73bcc /src/leap/gui | |
| parent | 36c944d24cd31fe380375ff7f8c709b1cf7c7827 (diff) | |
| parent | ee2ea741883aa6fa3b168431d588f20a5e90f5f2 (diff) | |
Merge branch 'feature/windows_install_tap' of git://github.com/chiiph/leap_client into develop
Conflicts:
src/leap/gui/mainwindow.py
Diffstat (limited to 'src/leap/gui')
| -rw-r--r-- | src/leap/gui/mainwindow.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py index a62bfc3b..863640ef 100644 --- a/src/leap/gui/mainwindow.py +++ b/src/leap/gui/mainwindow.py @@ -34,6 +34,7 @@ from leap.gui.wizard import Wizard from leap.services.eip.eipbootstrapper import EIPBootstrapper from leap.services.eip.eipconfig import EIPConfig from leap.services.eip.providerbootstrapper import ProviderBootstrapper +from leap.platform_init.initializers import init_platform from leap.services.eip.vpn import VPN from leap.services.eip.vpnlaunchers import (VPNLauncherException, OpenVPNNotFoundException, @@ -194,6 +195,9 @@ class MainWindow(QtGui.QMainWindow): self._settings = LeapSettings(standalone) self._center_window() + + init_platform() + self._wizard = None self._wizard_firstrun = False if self._first_run(): |