From 50b98bd079b9ef4f7bb9ba7da81db3ae416808fb Mon Sep 17 00:00:00 2001
From: Pavel Dohnal <pavel.dohnal@automattic.com>
Date: Fri, 19 Mar 2021 10:30:23 +0100
Subject: [PATCH] Only load queues after check passes

[MAILPOET-3481]
---
 lib/Entities/NewsletterEntity.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/Entities/NewsletterEntity.php b/lib/Entities/NewsletterEntity.php
index 934b2240a1..5450336b65 100644
--- a/lib/Entities/NewsletterEntity.php
+++ b/lib/Entities/NewsletterEntity.php
@@ -260,7 +260,7 @@ class NewsletterEntity {
   public function setStatus($status) {
     $this->status = $status;
 
-    $queues = $this->getUnfinishedQueues();
+    // activate/deactivate unfinished tasks
     $newTaskStatus = null;
     $typesWithActivation = [self::TYPE_NOTIFICATION, self::TYPE_WELCOME, self::TYPE_AUTOMATIC];
 
@@ -272,6 +272,9 @@ class NewsletterEntity {
     }
 
     if (!$newTaskStatus) return;
+
+    $queues = $this->getUnfinishedQueues();
+
     foreach ($queues as $queue) {
       /** @var SendingQueueEntity $queue */
       $task = $queue->getTask();