andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

Re-enable sent file merge when only FileType changes.

Browse Source 
GitOrigin-RevId: 728228d2397097ae1aaf68ce062c0cdd21fa0176
This commit is contained in:
levlam 2018-03-07 02:41:40 +03:00
parent c35bc1c0fc
commit 8b0cce1610
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
td/telegram/MessagesManager.cpp
View File

@ -22127,10 +22127,7 @@ bool MessagesManager::update_message_content(DialogId dialog_id, Message *old_me
FullLocalFileLocation(new_file_type, old_location.path_, old_location.mtime_nsec_), dialog_id,
old_file_view.size());
if (r_file_id.is_ok()) {
// disable merging a local location with the file, because it has lead to one local file having
// multiple remote locations. Therefore file_id -> remote_location correspondence was broken
// and file list hashes (for example, saved animation hashes) was wrongly calculated
// LOG_STATUS(td_->file_manager_->merge(new_file_id, r_file_id.ok()));
LOG_STATUS(td_->file_manager_->merge(new_file_id, r_file_id.ok()));
}
}
}