From 407b030bb7d27b797fb27254710a358c9c69f8be Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Thu, 24 Jan 2013 01:57:28 +0900
Subject: catch missing messages on last page of wizard

---
 src/leap/baseapp/eip.py        | 7 +++++--
 src/leap/baseapp/mainwindow.py | 2 ++
 src/leap/baseapp/network.py    | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/leap/baseapp')

diff --git a/src/leap/baseapp/eip.py b/src/leap/baseapp/eip.py
index 4c1fb32d..2f215f00 100644
--- a/src/leap/baseapp/eip.py
+++ b/src/leap/baseapp/eip.py
@@ -193,21 +193,24 @@ class EIPConductorAppMixin(object):
         # connection information via management interface
         log = self.conductor.get_log()
         error_matrix = [(EVENT_CONNECT_REFUSED, (self.start_or_stopVPN, ))]
-        self.network_checker.checker.parse_log_and_react(log, error_matrix)
+        if hasattr(self.network_checker, 'checker'):
+            self.network_checker.checker.parse_log_and_react(log, error_matrix)
 
     @QtCore.pyqtSlot()
-    def start_or_stopVPN(self):
+    def start_or_stopVPN(self, **kwargs):
         """
         stub for running child process with vpn
         """
         if self.conductor.has_errors():
             logger.debug('not starting vpn; conductor has errors')
+            return
 
         if self.eip_service_started is False:
             try:
                 self.conductor.connect()
 
             except eip_exceptions.EIPNoCommandError as exc:
+                logger.error('tried to run openvpn but no command is set')
                 self.triggerEIPError.emit(exc)
 
             except Exception as err:
diff --git a/src/leap/baseapp/mainwindow.py b/src/leap/baseapp/mainwindow.py
index b1e5bccf..91b0dc61 100644
--- a/src/leap/baseapp/mainwindow.py
+++ b/src/leap/baseapp/mainwindow.py
@@ -186,4 +186,6 @@ class LeapWindow(QtGui.QMainWindow,
         called from the end of wizard
         """
         self.show_systray_icon()
+        # this will setup the command
+        self.conductor.run_openvpn_checks()
         self.start_or_stopVPN()
diff --git a/src/leap/baseapp/network.py b/src/leap/baseapp/network.py
index d5685504..dc5182a4 100644
--- a/src/leap/baseapp/network.py
+++ b/src/leap/baseapp/network.py
@@ -36,6 +36,7 @@ class NetworkCheckerAppMixin(object):
 
     @QtCore.pyqtSlot(object)
     def runNetworkChecks(self):
+        logger.debug('running checks (from NetworkChecker Mixin slot)')
         self.network_checker.run_checks()
 
     @QtCore.pyqtSlot(object)
-- 
cgit v1.2.3