From 8588f698501886b5c9636777e2c5885ae150dad3 Mon Sep 17 00:00:00 2001
From: Nick Misasi <nick.misasi@mattermost.com>
Date: Thu, 25 Nov 2021 00:07:39 -0500
Subject: [PATCH] [MM-40342] Fix panic in Mattermost Server for cloud
 installations (#19046)

* Add a small change to trigger spinwick update

* Change if statement to fix panic

* Undo changes

* simplify logic
---
 jobs/resend_invitation_email/worker.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jobs/resend_invitation_email/worker.go b/jobs/resend_invitation_email/worker.go
index 457eed8c85..9776cb0719 100644
--- a/jobs/resend_invitation_email/worker.go
+++ b/jobs/resend_invitation_email/worker.go
@@ -109,7 +109,7 @@ func (rseworker *ResendInvitationEmailWorker) Execute(job *model.Job, elapsedTim
 		}
 	}
 
-	if (elapsedTimeSinceSchedule > firstDuration) && (systemValue.Value == "0") {
+	if (elapsedTimeSinceSchedule > firstDuration) && (systemValue == nil || systemValue.Value == "0") {
 		rseworker.ResendEmails(job, "48")
 		rseworker.setNumResendEmailSent(job, "1")
 	} else if elapsedTimeSinceSchedule > secondDuration {