mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-30 22:25:12 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into player

Browse Source
This commit is contained in:
John Preston
2016-09-23 22:22:40 +03:00
parent f970ac3163 947963d5d1
commit 38114d3297
21 changed files with 170 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Telegram/SourceFiles/mainwidget.cpp
View File

@@ -4602,9 +4602,8 @@ void MainWidget::feedUpdate(const MTPUpdate &update) {
}
// update before applying skipped
if (d.vmessage.type() == mtpc_message) { // apply message edit
App::updateEditedMessage(d.vmessage.c_message());
}
App::updateEditedMessage(d.vmessage);
if (channel && !_handlingChannelDifference) {
channel->ptsApplySkippedUpdates();
}
@@ -4618,14 +4617,8 @@ void MainWidget::feedUpdate(const MTPUpdate &update) {
}
// update before applying skipped
if (d.vmessage.type() == mtpc_message) { // apply message edit
App::updateEditedMessage(d.vmessage.c_message());
} else if (d.vmessage.type() == mtpc_messageService) {
auto &message = d.vmessage.c_messageService();
if (message.vaction.type() == mtpc_messageActionHistoryClear) {
App::updateEditedMessageToEmpty(peerFromMessage(d.vmessage), message.vid.v);
}
}
App::updateEditedMessage(d.vmessage);
ptsApplySkippedUpdates();
} break;