void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix crash in emoji interactions.

Browse source
This commit is contained in:
John Preston 2021-09-17 09:57:27 +03:00
parent 4d267327b8
commit cca08e3946
1 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
Telegram/SourceFiles/chat_helpers/emoji_interactions.cpp
View file

@ -239,16 +239,21 @@ auto EmojiInteractions::checkAnimations(
) -> CheckResult { ) -> CheckResult {
auto nearest = kTimeNever; auto nearest = kTimeNever;
auto waitingForDownload = false; auto waitingForDownload = false;
for (auto &[item, animations] : map) { for (auto i = begin(map); i != end(map);) {
auto lastStartedAt = crl::time(); auto lastStartedAt = crl::time();
auto &animations = i->second;
// Erase too old requests. // Erase too old requests.
const auto i = ranges::find_if(animations, [&](const Animation &a) { const auto j = ranges::find_if(animations, [&](const Animation &a) {
return !a.startedAt && (a.scheduledAt + kMaxDelay <= now); return !a.startedAt && (a.scheduledAt + kMaxDelay <= now);
}); });
if (i != end(animations)) { if (j == begin(animations)) {
animations.erase(i, end(animations)); i = map.erase(i);
continue;
} else if (j != end(animations)) {
animations.erase(j, end(animations));
} }
const auto item = i->first;
for (auto &animation : animations) { for (auto &animation : animations) {
if (animation.startedAt) { if (animation.startedAt) {
lastStartedAt = animation.startedAt; lastStartedAt = animation.startedAt;
@ -271,6 +276,7 @@ auto EmojiInteractions::checkAnimations(
break; break;
} }
} }
++i;
} }
return { return {
.nextCheckAt = nearest, .nextCheckAt = nearest,
@ -355,7 +361,7 @@ auto EmojiInteractions::checkAccumulated(crl::time now) -> CheckResult {
++i; ++i;
} }
for (auto i = begin(_incoming); i != end(_incoming);) { for (auto i = begin(_incoming); i != end(_incoming);) {
auto &[item, animations] = *i; auto &animations = i->second;
clearAccumulatedIncoming(now, animations); clearAccumulatedIncoming(now, animations);
if (animations.empty()) { if (animations.empty()) {
i = _incoming.erase(i); i = _incoming.erase(i);
@ -393,14 +399,15 @@ void EmojiInteractions::check(crl::time now) {
void EmojiInteractions::checkSeenRequests(crl::time now) { void EmojiInteractions::checkSeenRequests(crl::time now) {
for (auto i = begin(_playStarted); i != end(_playStarted);) { for (auto i = begin(_playStarted); i != end(_playStarted);) {
for (auto j = begin(i->second); j != end(i->second);) { auto &animations = i->second;
for (auto j = begin(animations); j != end(animations);) {
if (j->second + kAccumulateSeenRequests <= now) { if (j->second + kAccumulateSeenRequests <= now) {
j = i->second.erase(j); j = animations.erase(j);
} else { } else {
++j; ++j;
} }
} }
if (i->second.empty()) { if (animations.empty()) {
i = _playStarted.erase(i); i = _playStarted.erase(i);
} else { } else {
++i; ++i;
@ -410,15 +417,16 @@ void EmojiInteractions::checkSeenRequests(crl::time now) {
void EmojiInteractions::checkSentRequests(crl::time now) { void EmojiInteractions::checkSentRequests(crl::time now) {
for (auto i = begin(_playsSent); i != end(_playsSent);) { for (auto i = begin(_playsSent); i != end(_playsSent);) {
for (auto j = begin(i->second); j != end(i->second);) { auto &animations = i->second;
for (auto j = begin(animations); j != end(animations);) {
const auto last = j->second.lastDoneReceivedAt; const auto last = j->second.lastDoneReceivedAt;
if (last && last + kAcceptSeenSinceRequest <= now) { if (last && last + kAcceptSeenSinceRequest <= now) {
j = i->second.erase(j); j = animations.erase(j);
} else { } else {
++j; ++j;
} }
} }
if (i->second.empty()) { if (animations.empty()) {
i = _playsSent.erase(i); i = _playsSent.erase(i);
} else { } else {
++i; ++i;