From 69e9841bbbc678f07ffd07327625f9e9de950be8 Mon Sep 17 00:00:00 2001 From: AlexeyZavar Date: Sat, 9 Mar 2024 15:20:23 +0300 Subject: [PATCH] fix: rare crashes --- Telegram/SourceFiles/ayu/ayu_worker.cpp | 2 +- .../history/view/media/history_view_media_grouped.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Telegram/SourceFiles/ayu/ayu_worker.cpp b/Telegram/SourceFiles/ayu/ayu_worker.cpp index d74ef697d1..7129171539 100644 --- a/Telegram/SourceFiles/ayu/ayu_worker.cpp +++ b/Telegram/SourceFiles/ayu/ayu_worker.cpp @@ -34,7 +34,7 @@ void lateInit() { } void runOnce() { - if (!Core::IsAppLaunched() || !Core::App().domain().started()) { + if (!Core::IsAppLaunched() || !Core::App().domain().started() || Core::Quitting()) { return; } diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp index 038192cf15..15a65aabfe 100644 --- a/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp +++ b/Telegram/SourceFiles/history/view/media/history_view_media_grouped.cpp @@ -718,6 +718,10 @@ bool GroupedMedia::applyGroup(const DataMediaRange &medias) { auto modeChosen = false; for (const auto media : medias) { + if (!media) { + continue; // AyuGram: fix ebe44780-7c8b-4964-ba31-b747c947254f + } + const auto mediaMode = DetectMode(media); if (!modeChosen) { _mode = mediaMode;