tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix adding failed to send messages to dialog.

Browse Source 
GitOrigin-RevId: 1d09e032a12bc4338f7d28b70b9d8a4086ec0f0c
This commit is contained in:
levlam 2018-06-05 05:03:35 +03:00
parent dbe869e70c
commit 4806933832
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
td/telegram/MessagesManager.cpp
View File

@ -19712,7 +19712,7 @@ void MessagesManager::fail_send_message(FullMessageId full_message_id, int error
message->have_next = true; message->have_next = true;
bool need_update = false; bool need_update = false;
Message *m = add_message_to_dialog(dialog_id, std::move(message), true, &need_update, &need_update_dialog_pos, Message *m = add_message_to_dialog(dialog_id, std::move(message), false, &need_update, &need_update_dialog_pos,
"fail_send_message"); "fail_send_message");
CHECK(m != nullptr) << "Failed to add failed to send " << new_message_id << " to " << dialog_id << " due to " CHECK(m != nullptr) << "Failed to add failed to send " << new_message_id << " to " << dialog_id << " due to "
<< debug_add_message_to_dialog_fail_reason; << debug_add_message_to_dialog_fail_reason;
@ -22339,7 +22339,7 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq
if (!from_update && ((message_id.is_server() && d->last_new_message_id != MessageId() && if (!from_update && ((message_id.is_server() && d->last_new_message_id != MessageId() &&
message_id.get() > d->last_new_message_id.get()) || message_id.get() > d->last_new_message_id.get()) ||
(message_id.is_local() && d->last_database_message_id != MessageId() && (message_id.is_local() && d->last_database_message_id != MessageId() &&
message_id.get() > d->last_database_message_id.get()))) { message_id.get() > d->last_database_message_id.get() && !message->is_failed_to_send))) {
if (!message->from_database) { if (!message->from_database) {
LOG(ERROR) << "Ignore " << message_id << " in " << dialog_id << " received not through update from " << source LOG(ERROR) << "Ignore " << message_id << " in " << dialog_id << " received not through update from " << source
<< ". Last new is " << d->last_new_message_id << ", " << ". Last new is " << d->last_new_message_id << ", "