ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix another imagepack crash

Browse Source
This commit is contained in:
Tobias Fella
2023-05-06 21:04:49 +02:00
parent 4a29e0d0e1
commit d33a0c6644
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/imagepacksmodel.cpp
View File

@@ -83,10 +83,13 @@ void ImagePacksModel::setRoom(NeoChatRoom *room)
const auto &stickerRoom = m_room->connection()->room(roomId); const auto &stickerRoom = m_room->connection()->room(roomId);
for (const auto &packKey : packs.keys()) { for (const auto &packKey : packs.keys()) {
#ifdef QUOTIENT_07 #ifdef QUOTIENT_07
const auto packContent = stickerRoom->currentState().get<ImagePackEvent>(packKey)->content(); const auto &pack = stickerRoom->currentState().get<ImagePackEvent>(packKey);
if (!packContent.pack->usage || (packContent.pack->usage->contains("emoticon") && showEmoticons()) if (pack) {
|| (packContent.pack->usage->contains("sticker") && showStickers())) { const auto packContent = pack->content();
m_events += packContent; if (!packContent.pack->usage || (packContent.pack->usage->contains("emoticon") && showEmoticons())
|| (packContent.pack->usage->contains("sticker") && showStickers())) {
m_events += packContent;
}
} }
#endif #endif
} }