From bdfd3ddc08c4a444da62ece0463edb345d12a59f Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Fri, 24 May 2013 13:27:27 +0200
Subject: Fix error in env

---
 src/de/blinkt/openvpn/api/APIVpnProfile.java  | 2 --
 src/de/blinkt/openvpn/core/OpenVPNThread.java | 4 +++-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/de/blinkt')

diff --git a/src/de/blinkt/openvpn/api/APIVpnProfile.java b/src/de/blinkt/openvpn/api/APIVpnProfile.java
index 5445913a..dfcccf36 100644
--- a/src/de/blinkt/openvpn/api/APIVpnProfile.java
+++ b/src/de/blinkt/openvpn/api/APIVpnProfile.java
@@ -9,8 +9,6 @@ public class APIVpnProfile implements Parcelable {
 	public final String mName;
 	public final boolean mUserEditable;
 
-	
-
 	public APIVpnProfile(Parcel in) {
 		mUUID = in.readString();
 		mName = in.readString();
diff --git a/src/de/blinkt/openvpn/core/OpenVPNThread.java b/src/de/blinkt/openvpn/core/OpenVPNThread.java
index d8fff1dd..24d65b55 100644
--- a/src/de/blinkt/openvpn/core/OpenVPNThread.java
+++ b/src/de/blinkt/openvpn/core/OpenVPNThread.java
@@ -34,6 +34,7 @@ public class OpenVPNThread implements Runnable {
 		mArgv = argv;
 		mNativeDir = nativelibdir;
 		mService = service;
+		mProcessEnv = processEnv; 
 	}
 	
 	public void stopProcess() {
@@ -54,7 +55,8 @@ public class OpenVPNThread implements Runnable {
 		} finally {
 			int exitvalue = 0;
 			try {
-				 exitvalue = mProcess.waitFor();
+				if (mProcess!=null)
+					exitvalue = mProcess.waitFor();
 			} catch ( IllegalThreadStateException ite) {
 				OpenVPN.logError("Illegal Thread state: " + ite.getLocalizedMessage());
 			} catch (InterruptedException ie) {
-- 
cgit v1.2.3