From 41985c0a5f29450623c31e5bba016c15721aeda8 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Thu, 9 Jan 2025 22:40:37 +0300 Subject: [PATCH] Fixed ability to cancel of loading video as part of grouped media. --- .../history/view/media/history_view_gif.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp index c406982a0..389ffa189 100644 --- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp +++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp @@ -1488,8 +1488,13 @@ TextState Gif::getStateGrouped( if (!geometry.contains(point)) { return {}; } - if (fullFeaturedGrouped(sides)) { - if (const auto state = cornerStatusTextState(point, request, geometry.topLeft()); state.link) { + const auto isFullFeaturedGrouped = fullFeaturedGrouped(sides); + if (isFullFeaturedGrouped) { + const auto state = cornerStatusTextState( + point, + request, + geometry.topLeft()); + if (state.link) { return state; } } @@ -1500,10 +1505,12 @@ TextState Gif::getStateGrouped( ? _cancell : _realParent->isSending() ? nullptr - : (dataLoaded() || _dataMedia->canBePlayed(_realParent)) + : dataLoaded() ? _openl - : _data->loading() + : (_data->loading() && !isFullFeaturedGrouped) ? _cancell + : _dataMedia->canBePlayed(_realParent) + ? _openl : _savel; return TextState(_parent, std::move(link)); }