From 087200c132983e00c0edf174a69eaa5a9ac5b21a Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Tue, 30 Apr 2019 00:37:55 +0300
Subject: [PATCH] Do not try to reload stickers and saved animations while
 closing.

GitOrigin-RevId: 8b9532e89c3ae42390e29b6a6716de58dabd01db
---
 td/telegram/AnimationsManager.cpp |  4 ++++
 td/telegram/StickersManager.cpp   | 18 +++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/td/telegram/AnimationsManager.cpp b/td/telegram/AnimationsManager.cpp
index e2735111..50883f76 100644
--- a/td/telegram/AnimationsManager.cpp
+++ b/td/telegram/AnimationsManager.cpp
@@ -436,6 +436,10 @@ class AnimationsManager::AnimationListLogEvent {
 };
 
 void AnimationsManager::reload_saved_animations(bool force) {
+  if (G()->close_flag()) {
+    return;
+  }
+
   if (!td_->auth_manager_->is_bot() && next_saved_animations_load_time_ >= 0 &&
       (next_saved_animations_load_time_ < Time::now() || force)) {
     LOG_IF(INFO, force) << "Reload saved animations";
diff --git a/td/telegram/StickersManager.cpp b/td/telegram/StickersManager.cpp
index d1d63329..9ab4cae7 100644
--- a/td/telegram/StickersManager.cpp
+++ b/td/telegram/StickersManager.cpp
@@ -494,8 +494,8 @@ class ReorderStickerSetsQuery : public Td::ResultHandler {
   void on_error(uint64 id, Status status) override {
     if (!G()->close_flag()) {
       LOG(ERROR) << "Receive error for ReorderStickerSetsQuery: " << status;
+      td->stickers_manager_->reload_installed_sticker_sets(is_masks_, true);
     }
-    td->stickers_manager_->reload_installed_sticker_sets(is_masks_, true);
   }
 };
 
@@ -1357,6 +1357,10 @@ tl_object_ptr<telegram_api::InputStickerSet> StickersManager::get_input_sticker_
 }
 
 void StickersManager::reload_installed_sticker_sets(bool is_masks, bool force) {
+  if (G()->close_flag()) {
+    return;
+  }
+
   auto &next_load_time = next_installed_sticker_sets_load_time_[is_masks];
   if (!td_->auth_manager_->is_bot() && next_load_time >= 0 && (next_load_time < Time::now() || force)) {
     LOG_IF(INFO, force) << "Reload sticker sets";
@@ -1366,6 +1370,10 @@ void StickersManager::reload_installed_sticker_sets(bool is_masks, bool force) {
 }
 
 void StickersManager::reload_featured_sticker_sets(bool force) {
+  if (G()->close_flag()) {
+    return;
+  }
+
   if (!td_->auth_manager_->is_bot() && next_featured_sticker_sets_load_time_ >= 0 &&
       (next_featured_sticker_sets_load_time_ < Time::now() || force)) {
     LOG_IF(INFO, force) << "Reload featured sticker sets";
@@ -3711,6 +3719,10 @@ void StickersManager::send_update_featured_sticker_sets() {
 }
 
 void StickersManager::reload_recent_stickers(bool is_attached, bool force) {
+  if (G()->close_flag()) {
+    return;
+  }
+
   auto &next_load_time = next_recent_stickers_load_time_[is_attached];
   if (!td_->auth_manager_->is_bot() && next_load_time >= 0 && (next_load_time < Time::now() || force)) {
     LOG_IF(INFO, force) << "Reload recent " << (is_attached ? "attached " : "") << "stickers";
@@ -4131,6 +4143,10 @@ void StickersManager::on_update_favorite_stickers_limit(int32 favorite_stickers_
 }
 
 void StickersManager::reload_favorite_stickers(bool force) {
+  if (G()->close_flag()) {
+    return;
+  }
+
   if (!td_->auth_manager_->is_bot() && next_favorite_stickers_load_time_ >= 0 &&
       (next_favorite_stickers_load_time_ < Time::now() || force)) {
     LOG_IF(INFO, force) << "Reload favorite stickers";