From 0f829d6bbd49f9548c52f6a81d41474eb802fa66 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Fri, 7 Sep 2018 19:43:29 +0300
Subject: [PATCH] Prefer non-web remote location in merge.

GitOrigin-RevId: ce678712f457a3b3ece48d26aedfe3220e54e7bf
---
 td/telegram/files/FileManager.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/td/telegram/files/FileManager.cpp b/td/telegram/files/FileManager.cpp
index 7130a88f0..03f5f7b64 100644
--- a/td/telegram/files/FileManager.cpp
+++ b/td/telegram/files/FileManager.cpp
@@ -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;
     }