summaryrefslogtreecommitdiff
path: root/app/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java
diff options
context:
space:
mode:
authorkwadronaut <kwadronaut@leap.se>2017-05-17 11:05:41 +0200
committerkwadronaut <kwadronaut@leap.se>2017-05-17 11:05:41 +0200
commitac4047ce11c91a752c910f4afcd24f69a1621ef3 (patch)
tree044b866f2bd9a83246a6128c0e6f8afc4ce5a9d0 /app/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java
parent66c79953db6876ec17a7ebf50dc4fd07d24fae37 (diff)
parent59985587c758f93844df7600f18c0837c672f259 (diff)
Merge branch 'develop' move to 'master-'based development
Diffstat (limited to 'app/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java')
-rw-r--r--app/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java b/app/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java
index dfd815e4..d25bccad 100644
--- a/app/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java
+++ b/app/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2014 Arne Schwabe
+ * Copyright (c) 2012-2016 Arne Schwabe
* Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
*/
@@ -81,7 +81,7 @@ public class DisconnectVPN extends Activity implements DialogInterface.OnClickLi
if (which == DialogInterface.BUTTON_POSITIVE) {
ProfileManager.setConntectedVpnProfileDisconnected(this);
if (mService != null && mService.getManagement() != null)
- mService.getManagement().stopVPN();
+ mService.getManagement().stopVPN(false);
}
finish();
}