X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fserv_smtpqueue.c;h=2197acf63dd34d36bd95e6f54666f5fb0c8a9e02;hb=06e958649c74041cc5cc68ba23bc3d6cf70f1de4;hp=5f22ee6fbd2bfc3088b24fc3ada8b7bd4521facb;hpb=40170e6219348ea235429a4c830b54bc8a16eed3;p=citadel.git

diff --git a/citadel/modules/smtp/serv_smtpqueue.c b/citadel/modules/smtp/serv_smtpqueue.c
index 5f22ee6fb..2197acf63 100644
--- a/citadel/modules/smtp/serv_smtpqueue.c
+++ b/citadel/modules/smtp/serv_smtpqueue.c
@@ -671,8 +671,8 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
 		It = GetNewHashPos(MyQItem->MailQEntries, 0);
 		pthread_mutex_lock(&ActiveQItemsLock);
 		{
-			GetHashPosFromKey(ActiveQItems, LKEY(MyQItem->MessageID), It);
-			DeleteEntryFromHash(ActiveQItems, It);
+			if (GetHashPosFromKey(ActiveQItems, LKEY(MyQItem->MessageID), It))
+				DeleteEntryFromHash(ActiveQItems, It);
 		}
 		pthread_mutex_unlock(&ActiveQItemsLock);
 		////FreeQueItem(&MyQItem); TODO: DeleteEntryFromHash frees this?
@@ -688,8 +688,8 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
 		It = GetNewHashPos(MyQItem->MailQEntries, 0);
 		pthread_mutex_lock(&ActiveQItemsLock);
 		{
-			GetHashPosFromKey(ActiveQItems, LKEY(MyQItem->MessageID), It);
-			DeleteEntryFromHash(ActiveQItems, It);
+			if (GetHashPosFromKey(ActiveQItems, LKEY(MyQItem->MessageID), It))
+				DeleteEntryFromHash(ActiveQItems, It);
 		}
 		pthread_mutex_unlock(&ActiveQItemsLock);
 		DeleteHashPos(&It);