Queue delay checks only with the current job

Hoektronics · May 5, 2015 · 5e7653b · 5e7653b
1 parent 02dc6f7
commit 5e7653b
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/models/Bot/bot.php b/models/Bot/bot.php
@@ -315,10 +315,9 @@ public function canGrab($job)
 
 		$sql = "select DATE_SUB(NOW(), INTERVAL queues.delay SECOND) > MAX(jobs.taken_time)
 			FROM queues, jobs
-			WHERE queues.id = jobs.queue_id
-			AND queues.id IN
-			(SELECT queue_id from bot_queues where bot_id = ?)";
-		if(db()->getValue($sql, array($this->id)) == 0)
+			WHERE queues.id = ?
+			AND queues.id = jobs.queue_id";
+		if(db()->getValue($sql, array($job->getQueue()->id)) == 0)
 			return false;
 
 		return true;