From de8c673f3806d4754e45de5b8ae6af8627101d23 Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Mon, 26 Feb 2018 09:23:30 +0100
Subject: [PATCH] fix(MainDb): ensure contents are loaded before add event

---
 src/chat/chat-message/chat-message.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/chat/chat-message/chat-message.cpp b/src/chat/chat-message/chat-message.cpp
index f7d922056..de582fcab 100644
--- a/src/chat/chat-message/chat-message.cpp
+++ b/src/chat/chat-message/chat-message.cpp
@@ -762,6 +762,9 @@ void ChatMessagePrivate::storeInDb () {
 		updateInDb();
 	} else {
 		shared_ptr<EventLog> eventLog = make_shared<ConferenceChatMessageEvent>(time, q->getSharedFromThis());
+
+		// Avoid transaction in transaction if contents are not loaded.
+		loadContentsFromDatabase();
 		q->getChatRoom()->getPrivate()->addEvent(eventLog);
 
 		if (direction == ChatMessage::Direction::Incoming) {