From 156291b2c15895c41bd3d096d03a88433de49084 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Sat, 12 Jan 2019 20:38:50 +0100 Subject: Fix crash when sending message with no previous message --- src/Room.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/Room.cpp b/src/Room.cpp index a8a8d6a..c7135da 100644 --- a/src/Room.cpp +++ b/src/Room.cpp @@ -281,16 +281,19 @@ namespace dchat { case RoomDataType::ADD_MESSAGE: { - RoomMessage message; - message.id = *request.requestHash; - message.creator = user; - message.timestampSeconds = timestampSeconds; - message.text = std::string((const char*)request.decryptedData.data + 1, request.decryptedData.size - 1); + auto message = std::make_shared(); + message->id = *request.requestHash; + message->creator = user; + message->timestampSeconds = timestampSeconds; + message->text = std::string((const char*)request.decryptedData.data + 1, request.decryptedData.size - 1); RoomAddMessageRequest roomRequest; roomRequest.room = room; roomRequest.loadedFromCache = request.loadedFromCache; roomRequest.message = std::move(message); + roomRequest.prevMessage = nullptr; + if(!room->messages.empty()) + roomRequest.prevMessage = room->messages.back(); if(callbackFuncs.addMessageCallbackFunc) callbackFuncs.addMessageCallbackFunc(roomRequest); -- cgit v1.2.3