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

Prefer non-web remote location in merge.

Browse Source 
GitOrigin-RevId: ce678712f457a3b3ece48d26aedfe3220e54e7bf
This commit is contained in:
levlam 2018-09-07 19:43:29 +03:00
parent a72021c170
commit 0f829d6bbd
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
td/telegram/files/FileManager.cpp
View File

@ -831,6 +831,9 @@ static int merge_choose_remote_location(const RemoteFileLocation &x, int8 x_sour
}
// If access_hash changed use a newer one
if (x.type() == RemoteFileLocation::Type::Full) {
if (x.full().is_web() != y.full().is_web()) {
return x.full().is_web(); // prefer non-web
}
if (x.full().get_access_hash() != y.full().get_access_hash()) {
return x_source < y_source;
}