From 6cc83f025f9b11e25f6ed14ec64ed255a7da5d8b Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Sat, 19 Jan 2019 22:42:06 +0300
Subject: [PATCH] Better fir for merge_choose_generate_location.

GitOrigin-RevId: 23286b6d59cbfefae852b63f6cf6daa7e41d2690
---
 td/telegram/files/FileManager.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/td/telegram/files/FileManager.cpp b/td/telegram/files/FileManager.cpp
index 45201539..f4ff376f 100644
--- a/td/telegram/files/FileManager.cpp
+++ b/td/telegram/files/FileManager.cpp
@@ -966,17 +966,15 @@ static int merge_choose_generate_location(const unique_ptr<FullGenerateFileLocat
   if (x_empty != y_empty) {
     return x_empty ? 1 : 0;
   }
-  if (!x_empty) {
+  if (!x_empty && *x != *y) {
     bool x_has_mtime = begins_with(x->conversion_, "#mtime#");
     bool y_has_mtime = begins_with(y->conversion_, "#mtime#");
     if (x_has_mtime != y_has_mtime) {
       return x_has_mtime ? 0 : 1;
     }
-    if (x->conversion_ != y->conversion) {
-      return x->conversion_ >= y->conversion_
-                 ? 0
-                 : 1;  // the bigger conversion, the bigger mtime or at least more stable choise
-    }
+    return x->conversion_ >= y->conversion_
+               ? 0
+               : 1;  // the bigger conversion, the bigger mtime or at least more stable choise
   }
   return 2;
 }