From f690b76efaa43a0aa135f5943545aeba59ed7ca9 Mon Sep 17 00:00:00 2001 From: Tobias Fella Date: Fri, 27 Oct 2023 21:45:55 +0200 Subject: [PATCH] Fix crash for events that are not RoomMessageEvents BUG: 476153 --- src/models/messageeventmodel.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/models/messageeventmodel.cpp b/src/models/messageeventmodel.cpp index 702b6ef85..6e55aa656 100644 --- a/src/models/messageeventmodel.cpp +++ b/src/models/messageeventmodel.cpp @@ -100,7 +100,9 @@ void MessageEventModel::setRoom(NeoChatRoom *room) room->setDisplayed(); for (auto event = m_currentRoom->messageEvents().begin(); event != m_currentRoom->messageEvents().end(); ++event) { - createEventObjects(&*event->viewAs()); + if (const auto &roomMessageEvent = &*event->viewAs()) { + createEventObjects(roomMessageEvent); + } } if (m_currentRoom->timelineSize() < 10 && !room->allHistoryLoaded()) { @@ -120,9 +122,8 @@ void MessageEventModel::setRoom(NeoChatRoom *room) for (auto &&event : events) { const RoomMessageEvent *message = dynamic_cast(event.get()); - createEventObjects(message); - if (message != nullptr) { + createEventObjects(message); if (NeoChatConfig::self()->showFancyEffects()) { QString planBody = message->plainBody(); // snowflake