Always clean ds queue

Closes #727

src/darksend.cpp

@@ -792,6 +792,18 @@ void CDarksendPool::ChargeRandomFees(){
 // Check for various timeouts (queue objects, Darksend, etc)
 //
 void CDarksendPool::CheckTimeout(){
+
+    // check Darksend queue objects for timeouts
+    int c = 0;
+    vector<CDarksendQueue>::iterator it = vecDarksendQueue.begin();
+    while(it != vecDarksendQueue.end()){
+        if((*it).IsExpired()){
+            LogPrint("darksend", "CDarksendPool::CheckTimeout() : Removing expired queue entry - %d\n", c);
+            it = vecDarksendQueue.erase(it);
+        } else ++it;
+        c++;
+    }
+
     if(!fEnableDarksend && !fMasterNode) return;
 
     // catching hanging sessions
@@ -812,17 +824,6 @@ void CDarksendPool::CheckTimeout(){
         }
     }
 
-    // check Darksend queue objects for timeouts
-    int c = 0;
-    vector<CDarksendQueue>::iterator it = vecDarksendQueue.begin();
-    while(it != vecDarksendQueue.end()){
-        if((*it).IsExpired()){
-            LogPrint("darksend", "CDarksendPool::CheckTimeout() : Removing expired queue entry - %d\n", c);
-            it = vecDarksendQueue.erase(it);
-        } else ++it;
-        c++;
-    }
-
     int addLagTime = 0;
     if(!fMasterNode) addLagTime = 10000; //if we're the client, give the server a few extra seconds before resetting.
 

src/darksend.h

@@ -146,7 +146,7 @@ public:
 
     bool IsExpired()
     {
-        return (GetTime() - addedTime) > DARKSEND_QUEUE_TIMEOUT;// 120 seconds
+        return (GetTime() - addedTime) > DARKSEND_QUEUE_TIMEOUT;// 30 seconds
     }
 };
 
@@ -220,7 +220,7 @@ public:
     /// Is this Darksend expired?
     bool IsExpired()
     {
-        return (GetTime() - time) > DARKSEND_QUEUE_TIMEOUT;// 120 seconds
+        return (GetTime() - time) > DARKSEND_QUEUE_TIMEOUT;// 30 seconds
     }
 
     /// Check if we have a valid Masternode address