From e3ed2fcaa9661b5e389eb4a02592e3ec97c78ba5 Mon Sep 17 00:00:00 2001 From: Tobias Fella Date: Tue, 20 Feb 2024 20:36:33 +0100 Subject: [PATCH] Fix crash in ImagePacksModel --- src/models/imagepacksmodel.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/models/imagepacksmodel.cpp b/src/models/imagepacksmodel.cpp index 38ec1188d..ddba27c44 100644 --- a/src/models/imagepacksmodel.cpp +++ b/src/models/imagepacksmodel.cpp @@ -64,11 +64,13 @@ void ImagePacksModel::setRoom(NeoChatRoom *room) } m_room = room; - connect(m_room->connection(), &Connection::accountDataChanged, this, [this](const QString &type) { - if (type == "im.ponies.user_emotes"_ls) { - reloadImages(); - } - }); + if (m_room) { + connect(m_room->connection(), &Connection::accountDataChanged, this, [this](const QString &type) { + if (type == "im.ponies.user_emotes"_ls) { + reloadImages(); + } + }); + } // TODO listen to packs changing reloadImages(); Q_EMIT roomChanged(); @@ -76,6 +78,9 @@ void ImagePacksModel::setRoom(NeoChatRoom *room) void ImagePacksModel::reloadImages() { + if (!m_room) { + return; + } beginResetModel(); m_events.clear();