From c627c79b6a9cc2ba3fd3c90631af0b6dde4e1acd Mon Sep 17 00:00:00 2001 From: levlam Date: Mon, 6 Jan 2020 04:45:05 +0300 Subject: [PATCH] Improve logging. GitOrigin-RevId: 4c5be88bb5f89b50ca1872a8a6686b777fe8aaa2 --- td/telegram/MessagesManager.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp index 55c49a1d..30bba6b0 100644 --- a/td/telegram/MessagesManager.cpp +++ b/td/telegram/MessagesManager.cpp @@ -18772,9 +18772,14 @@ void MessagesManager::on_upload_message_media_finished(int64 media_album_id, Dia auto &request = it->second; CHECK(request.dialog_id == dialog_id); auto message_it = std::find(request.message_ids.begin(), request.message_ids.end(), message_id); - LOG_CHECK(message_it != request.message_ids.end()) - << dialog_id << ' ' << request.message_ids << ' ' << message_id << ' ' << request.finished_count << ' ' - << request.is_finished << ' ' << request.results; + if (message_it == request.message_ids.end()) { + // the message may be already deleted and the album is recreated without it + CHECK(message_id.is_yet_unsent()); + LOG_CHECK(get_message({dialog_id, message_id}) == nullptr) + << dialog_id << ' ' << request.message_ids << ' ' << message_id << ' ' << request.finished_count << ' ' + << request.is_finished << ' ' << request.results; + return; + } auto pos = static_cast(message_it - request.message_ids.begin()); if (request.is_finished[pos]) {