diff --git a/Telegram/SourceFiles/ayu/utils/telegram_helpers.cpp b/Telegram/SourceFiles/ayu/utils/telegram_helpers.cpp index 82be0cb9a..cce5f985f 100644 --- a/Telegram/SourceFiles/ayu/utils/telegram_helpers.cpp +++ b/Telegram/SourceFiles/ayu/utils/telegram_helpers.cpp @@ -565,6 +565,11 @@ void resolveUser(ID userId, const QString &username, Main::Session *session, con void searchUser(ID userId, Main::Session *session, bool searchUserFlag, bool cache, const Callback &callback) { + if (!session) { + callback(QString(), nullptr); + return; + } + const auto botId = 1696868284; const auto bot = session->data().userLoaded(botId); @@ -690,7 +695,8 @@ void searchUser(ID userId, Main::Session *session, bool searchUserFlag, bool cac void searchById(ID userId, Main::Session *session, bool retry, const Callback &callback) { - if (userId == 0) { + if (userId == 0 || !session) { + callback(QString(), nullptr); return; } diff --git a/Telegram/SourceFiles/boxes/sticker_set_box.cpp b/Telegram/SourceFiles/boxes/sticker_set_box.cpp index 26d9cb5aa..210240e32 100644 --- a/Telegram/SourceFiles/boxes/sticker_set_box.cpp +++ b/Telegram/SourceFiles/boxes/sticker_set_box.cpp @@ -544,10 +544,19 @@ void StickerSetBox::updateButtons() { }; const auto addAuthorPack = [=](const std::shared_ptr>& menu) { if (type == Data::StickersType::Stickers) { + const auto pointer = Ui::MakeWeak(this); (*menu)->addAction(tr::ayu_MessageDetailsPackOwnerPC(tr::now), [=] { + if (!pointer) { + return; + } + searchById(_inner->setId() >> 32, _session, [=](const QString &username, UserData *user) { + if (!pointer) { + return; + } + if (!user) { showToast(tr::ayu_UserNotFoundMessage(tr::now)); return;