From 6a119f971f5e50e2df80cdc785301f0399cbbe23 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 24 Apr 2018 11:31:20 +0200
Subject: [PATCH] Do not notify message delivery if the core is being shut
 down.

---
 coreapi/callbacks.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c
index bb6919d81..3c1717904 100644
--- a/coreapi/callbacks.c
+++ b/coreapi/callbacks.c
@@ -604,6 +604,12 @@ static LinphoneChatMessageState chatStatusSal2Linphone(SalMessageDeliveryStatus
 }
 
 static void message_delivery_update(SalOp *op, SalMessageDeliveryStatus status) {
+	auto lc = reinterpret_cast<LinphoneCore *>(op->get_sal()->get_user_pointer());
+	if (linphone_core_get_global_state(lc) != LinphoneGlobalOn) {
+		static_cast<SalReferOp *>(op)->reply(SalReasonDeclined);
+		return;
+	}
+
 	LinphonePrivate::ChatMessage *msg = reinterpret_cast<LinphonePrivate::ChatMessage *>(op->get_user_pointer());
 	if (!msg)
 		return; // Do not handle delivery status for isComposing messages.