From 02983230d9256c7a86bfda3aea7bf9fdb467b34e Mon Sep 17 00:00:00 2001
From: Alter Step <alterstep@localhost>
Date: Sun, 23 Aug 2015 13:44:00 +0200
Subject: [PATCH] Quit trying to start the proxy if the user changed their mind

---
 .../scripts/switch-to-dnscrypt-if-required.sh    | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/switch-to-dnscrypt-if-required.sh b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/switch-to-dnscrypt-if-required.sh
index 4196aea..ca46629 100755
--- a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/switch-to-dnscrypt-if-required.sh
+++ b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/switch-to-dnscrypt-if-required.sh
@@ -2,8 +2,9 @@
 
 . ./common.inc
 
-PAUSE_MAX=10
-PAUSE_INCREMENT=0.1
+PAUSE_MAX=50
+PAUSE_UNIT=0.1
+PAUSE_INCREMENT=1
 
 [ ! -e "$DNSCRYPT_FILE" ] && exit 0
 
@@ -21,10 +22,13 @@ while [ -e "$DNSCRYPT_FILE" ]; do
       ./switch-to-dhcp.sh
     fi
   fi
-  if [ $pause -lt $PAUSE_MAX ]; then
-    pause=$((pause + $PAUSE_INCREMENT))
-  fi
-  sleep $pause
+  [ $pause -lt $PAUSE_MAX ] &&  pause=$((pause + 1))
+  pause_counter=0
+  while [ -e "$DNSCRYPT_FILE" -a $pause_counter -lt $pause ]; do
+    sleep $PAUSE_UNIT
+    pause_counter=$((pause_counter + 1))
+  done
+  [ ! -e "$DNSCRYPT_FILE" ] && break
   logger_debug "Checking if the router hijacks HTTP queries"
   if ./check-hijacking.sh; then
     logger_debug "The router doesn't hijack HTTP queries"