Merge branch 'feature/detect_and_stop_vpn' into develop

1 files changed, 10 insertions, 9 deletions

diff --git a/src/leap/eip/eipconnection.py b/src/leap/eip/eipconnection.py
index fea830f3..f0e7861e 100644
--- a/src/leap/eip/eipconnection.py
+++ b/src/leap/eip/eipconnection.py
@@ -91,7 +91,8 @@ class EIPConnection(OpenVPNConnection):
         """
         disconnects client
         """
-        self._disconnect()
+        self.cleanup()
+        logger.debug("disconnect: clicked.")
         self.status.change_to(self.status.DISCONNECTED)
 
     def shutdown(self):
@@ -141,14 +142,14 @@ class EIPConnection(OpenVPNConnection):
     # private methods
     #
 
-    def _disconnect(self):
-        """
-        private method for disconnecting
-        """
-        if self.subp is not None:
-            logger.debug('disconnecting...')
-            self.subp.terminate()
-            self.subp = None
+    #def _disconnect(self):
+    #    """
+    #    private method for disconnecting
+    #    """
+    #    if self.subp is not None:
+    #        logger.debug('disconnecting...')
+    #        self.subp.terminate()
+    #        self.subp = None
 
     #def _is_alive(self):
         #"""