Only update the next_send_time for disabled users when the time was reached

Signed-off-by: Joas Schilling <coding@schilljs.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/lib/MailNotifications.php b/lib/MailNotifications.php
index 5f5ea1e..990ec6b 100644
--- a/lib/MailNotifications.php
+++ b/lib/MailNotifications.php
@@ -144,10 +144,12 @@ class MailNotifications {
 		foreach ($userSettings as $settings) {
 			if (isset($userEnabled[$settings->getUserId()]) && $userEnabled[$settings->getUserId()] === 'false') {
 				// User is disabled, skip sending the email for them
-				$settings->setNextSendTime(
-					$settings->getNextSendTime() + $settings->getBatchTime()
-				);
-				$this->settingsMapper->update($settings);
+				if ($settings->getNextSendTime() <= $sendTime) {
+					$settings->setNextSendTime(
+						$sendTime + $settings->getBatchTime()
+					);
+					$this->settingsMapper->update($settings);
+				}
 				continue;
 			}