From c9ddf2f04aa1cc8378061098eb7ae578ae534b48 Mon Sep 17 00:00:00 2001 From: Tobias Fella Date: Sat, 6 May 2023 15:31:20 +0200 Subject: [PATCH] Fix crash when there are no account emojis --- src/imagepacksmodel.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/imagepacksmodel.cpp b/src/imagepacksmodel.cpp index d2b9391cb..cc954d6fb 100644 --- a/src/imagepacksmodel.cpp +++ b/src/imagepacksmodel.cpp @@ -63,13 +63,15 @@ void ImagePacksModel::setRoom(NeoChatRoom *room) // TODO listen to account data changing // TODO listen to packs changing - auto json = m_room->connection()->accountData("im.ponies.user_emotes"_ls)->contentJson(); - json["pack"] = QJsonObject{ - {"display_name", i18n("Own Stickers")}, - }; - const auto &content = ImagePackEventContent(json); - if (!content.images.isEmpty()) { - m_events += ImagePackEventContent(json); + if (m_room->connection()->hasAccountData("im.ponies.user_emotes"_ls)) { + auto json = m_room->connection()->accountData("im.ponies.user_emotes"_ls)->contentJson(); + json["pack"] = QJsonObject{ + {"display_name", i18n("Own Stickers")}, + }; + const auto &content = ImagePackEventContent(json); + if (!content.images.isEmpty()) { + m_events += ImagePackEventContent(json); + } } const auto &accountData = m_room->connection()->accountData("im.ponies.emote_rooms"_ls); if (accountData) {