From a773ad7b0240620c2faa37168522d0fde7324021 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 6 Sep 2019 19:29:10 +0300
Subject: [PATCH] Fix reverting edited theme values.

---
 Telegram/SourceFiles/window/themes/window_theme_editor.cpp | 7 +++++--
 .../SourceFiles/window/themes/window_themes_cloud_list.cpp | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/window/themes/window_theme_editor.cpp b/Telegram/SourceFiles/window/themes/window_theme_editor.cpp
index 23eabc3a0..0ce2018ab 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_editor.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme_editor.cpp
@@ -363,12 +363,15 @@ Editor::Inner::Inner(QWidget *parent, const QString &path) : TWidget(parent)
 		}
 	});
 	subscribe(Background(), [this](const BackgroundUpdate &update) {
-		if (_applyingUpdate) return;
+		if (_applyingUpdate || !Background()->editingTheme()) {
+			return;
+		}
 
 		if (update.type == BackgroundUpdate::Type::TestingTheme) {
 			Revert();
 			App::CallDelayed(st::slideDuration, this, [] {
-				Ui::show(Box<InformBox>(tr::lng_theme_editor_cant_change_theme(tr::now)));
+				Ui::show(Box<InformBox>(
+					tr::lng_theme_editor_cant_change_theme(tr::now)));
 			});
 		}
 	});
diff --git a/Telegram/SourceFiles/window/themes/window_themes_cloud_list.cpp b/Telegram/SourceFiles/window/themes/window_themes_cloud_list.cpp
index f27031045..e70798c6a 100644
--- a/Telegram/SourceFiles/window/themes/window_themes_cloud_list.cpp
+++ b/Telegram/SourceFiles/window/themes/window_themes_cloud_list.cpp
@@ -546,6 +546,7 @@ void CloudList::refreshColorsFromDocument(
 		colors->background = ColorsFromCurrentTheme().background;
 	}
 	element.check->setColors(*colors);
+	setWaiting(element, false);
 }
 
 void CloudList::subscribeToDownloadFinished() {