From 45f46afdd384435545040f5ee851122d2a040dac Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Thu, 5 Dec 2013 07:37:33 +0100
Subject: Fix NPE in DeviceStateReceiver

---
 src/de/blinkt/openvpn/core/OpenVpnService.java | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/de/blinkt/openvpn/core')

diff --git a/src/de/blinkt/openvpn/core/OpenVpnService.java b/src/de/blinkt/openvpn/core/OpenVpnService.java
index 3a6cc802..c0b24c3a 100644
--- a/src/de/blinkt/openvpn/core/OpenVpnService.java
+++ b/src/de/blinkt/openvpn/core/OpenVpnService.java
@@ -328,6 +328,12 @@ public class OpenVpnService extends VpnService implements StateListener, Callbac
         // An old running VPN should now be exited
         mStarting = false;
 
+        // Start a new session by creating a new thread.
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+
+        mOvpn3 = prefs.getBoolean("ovpn3", false);
+        mOvpn3 = false;
+
 
         // Open the Management Interface
         if (!mOvpn3) {
@@ -340,14 +346,12 @@ public class OpenVpnService extends VpnService implements StateListener, Callbac
                 mSocketManagerThread.start();
                 mManagement = ovpnManagementThread;
                 VpnStatus.logInfo("started Socket Thread");
+            } else {
+                return START_NOT_STICKY;
             }
         }
 
-        // Start a new session by creating a new thread.
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
 
-        mOvpn3 = prefs.getBoolean("ovpn3", false);
-        mOvpn3 = false;
 
         Runnable processThread;
         if (mOvpn3) {
-- 
cgit v1.2.3