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

---
 openvpn/Android.mk                             |  5 ++++-
 openvpn/config.h                               |  2 +-
 src/de/blinkt/openvpn/core/OpenVpnService.java | 12 ++++++++----
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/openvpn/Android.mk b/openvpn/Android.mk
index 7307a0b3..1bc1be4e 100644
--- a/openvpn/Android.mk
+++ b/openvpn/Android.mk
@@ -26,6 +26,8 @@ endif
 
 LOCAL_MODULE = openvpn
 
+
+
 LOCAL_SRC_FILES:= \
 	src/compat/compat-basename.c \
 	src/compat/compat-daemon.c \
@@ -102,7 +104,8 @@ LOCAL_SRC_FILES:= \
 	src/openvpn/tun.c \
 	src/openvpn/snappy.c \
 	src/openvpn/comp.c \
-	src/openvpn/compstub.c
+	src/openvpn/compstub.c 
+
 
 ifeq ($(WITH_BREAKPAD),1)
 LOCAL_SRC_FILES+=src/openvpn/breakpad.cpp
diff --git a/openvpn/config.h b/openvpn/config.h
index ba8dbed4..2f5cc0b3 100644
--- a/openvpn/config.h
+++ b/openvpn/config.h
@@ -450,7 +450,7 @@
 #define PACKAGE_NAME "OpenVPN"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "OpenVPN 2.3.2+dspatch4"
+#define PACKAGE_STRING "OpenVPN 2.4-icsopenvpn"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "openvpn"
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