From 1e285da9593343225a30870aeb2b590513c3972f Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 2 Oct 2017 17:41:46 +0200
Subject: [PATCH] Fix creation of ChatMessage from history if id is null

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

diff --git a/src/chat/chat-room.cpp b/src/chat/chat-room.cpp
index 5a6abe170..4a99b6a79 100644
--- a/src/chat/chat-room.cpp
+++ b/src/chat/chat-room.cpp
@@ -297,7 +297,9 @@ int ChatRoomPrivate::createChatMessageFromDb (int argc, char **argv, char **colN
 		if (argv[10]) {
 			message->setAppdata(argv[10]);
 		}
-		message->setId(argv[12]);
+		if (argv[12]) {
+			message->setId(argv[12]);
+		}
 		message->setIsSecured((bool)atoi(argv[14]));
 
 		if (argv[11]) {