Fix creation of ChatMessage from history if id is null

1e285da9 · Sylvain Berfini · 83e8d95a · 1e285da9
Commit 1e285da9 authored Oct 02, 2017 by Sylvain Berfini 🎩
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

src/chat/chat-room.cpp src/chat/chat-room.cpp +3 -1

No files found.
--- 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]) {