summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2013-05-24 13:27:27 +0200
committerArne Schwabe <arne@rfc2549.org>2013-05-24 13:27:27 +0200
commitbdfd3ddc08c4a444da62ece0463edb345d12a59f (patch)
tree28b893f5fa09519b908029b35b37272c0b037701 /src
parent58f731459b7ebc7fe165f011d459ef9144fcc9fc (diff)
Fix error in env
Diffstat (limited to 'src')
-rw-r--r--src/de/blinkt/openvpn/api/APIVpnProfile.java2
-rw-r--r--src/de/blinkt/openvpn/core/OpenVPNThread.java4
2 files changed, 3 insertions, 3 deletions
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) {