From b533b2c98a30dcf390baf48017848ddcae348103 Mon Sep 17 00:00:00 2001
From: M66B <marcel@faircode.eu>
Date: Fri, 13 Nov 2015 11:35:42 +0100
Subject: [PATCH] Handle race condition with outher VPN solutions

---
 app/src/main/java/eu/faircode/netguard/SinkholeService.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/netguard/SinkholeService.java b/app/src/main/java/eu/faircode/netguard/SinkholeService.java
index 2626eb8c..198a0c6f 100644
--- a/app/src/main/java/eu/faircode/netguard/SinkholeService.java
+++ b/app/src/main/java/eu/faircode/netguard/SinkholeService.java
@@ -109,6 +109,8 @@ public class SinkholeService extends VpnService {
                         vpn = startVPN();
                         startDebug(vpn);
                     }
+                    if (vpn == null)
+                        prefs.edit().putBoolean("enabled", false).apply();
                     removeDisabledNotification();
                     Widget.updateWidgets(SinkholeService.this);
                     break;
@@ -209,7 +211,7 @@ public class SinkholeService extends VpnService {
     }
 
     private void startDebug(final ParcelFileDescriptor pfd) {
-        if (!debug)
+        if (pfd == null || !debug)
             return;
 
         thread = new Thread(new Runnable() {