From 64150108b84cffe3e46aab4c424b58399e6b621f Mon Sep 17 00:00:00 2001 From: levlam Date: Fri, 22 Feb 2019 03:29:21 +0300 Subject: [PATCH] Better fix for updateChatIsPinned. GitOrigin-RevId: 5ac58bf88cc61daada427f137335e4d14b4c33f9 --- td/telegram/MessagesManager.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp index b80437c1a..0dff5f27b 100644 --- a/td/telegram/MessagesManager.cpp +++ b/td/telegram/MessagesManager.cpp @@ -9943,19 +9943,19 @@ void MessagesManager::set_dialog_is_pinned(DialogId dialog_id, bool is_pinned) { void MessagesManager::set_dialog_is_pinned(Dialog *d, bool is_pinned) { CHECK(d != nullptr); bool was_pinned = d->pinned_order != DEFAULT_ORDER; - auto old_order = DialogDate(d->order, d->dialog_id) <= last_dialog_date_ ? d->order : 0; d->pinned_order = is_pinned ? get_next_pinned_dialog_order() : DEFAULT_ORDER; - update_dialog_pos(d, false, "set_dialog_is_pinned", false); - auto new_order = DialogDate(d->order, d->dialog_id) <= last_dialog_date_ ? d->order : 0; on_dialog_updated(d->dialog_id, "set_dialog_is_pinned"); if (is_pinned != was_pinned) { LOG(INFO) << "Set " << d->dialog_id << " is pinned to " << is_pinned; - } - if (old_order != new_order) { LOG_CHECK(d->is_update_new_chat_sent) << "Wrong " << d->dialog_id << " in set_dialog_is_pinned"; + update_dialog_pos(d, false, "set_dialog_is_pinned", false); + DialogDate dialog_date(d->order, d->dialog_id); send_closure(G()->td(), &Td::send_update, - make_tl_object(d->dialog_id.get(), is_pinned, new_order)); + make_tl_object(d->dialog_id.get(), is_pinned, + dialog_date <= last_dialog_date_ ? d->order : 0)); + } else { + update_dialog_pos(d, false, "set_dialog_is_pinned 2"); } }