1 files changed, 7 insertions, 3 deletions
diff --git a/app/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java b/app/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java
index 4c550f47..569a3846 100644
--- a/app/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java
+++ b/app/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java
@@ -49,6 +49,7 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement {
 
     private pauseReason lastPauseReason = pauseReason.noNetwork;
     private PausedStateCallback mPauseCallback;
+    private boolean mShuttingDown;
 
     public OpenVpnManagementThread(VpnProfile profile, OpenVPNService openVpnService) {
         mProfile = profile;
@@ -223,7 +224,8 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement {
                     processByteCount(argument);
                     break;
                 case "STATE":
-                    processState(argument);
+                    if (!mShuttingDown)
+                        processState(argument);
                     break;
                 case "PROXY":
                     processProxyCMD(argument);
@@ -452,7 +454,7 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement {
 
                 break;
             default:
-                Log.e(TAG, "Unkown needok command " + argument);
+                Log.e(TAG, "Unknown needok command " + argument);
                 return;
         }
 
@@ -621,7 +623,9 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement {
     }
 
     @Override
-    public boolean stopVPN() {
+    public boolean stopVPN(boolean replaceConnection) {
+        mShuttingDown = true;
         return stopOpenVPN();
     }
+
 }