From dddd355f6cf656826bd102dab801b6230ea4e1f4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 15 Jun 2020 13:35:35 +0400
Subject: [PATCH] Fix language and theme writing / reading.

---
 Telegram/SourceFiles/boxes/language_box.cpp   | 6 ++++--
 Telegram/SourceFiles/storage/localstorage.cpp | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/language_box.cpp b/Telegram/SourceFiles/boxes/language_box.cpp
index 135186d91..f90587ffa 100644
--- a/Telegram/SourceFiles/boxes/language_box.cpp
+++ b/Telegram/SourceFiles/boxes/language_box.cpp
@@ -1100,10 +1100,12 @@ void LanguageBox::prepare() {
 	) | rpl::start_with_next([=](const Language &language) {
 		// "#custom" is applied each time it's passed to switchToLanguage().
 		// So we check that the language really has changed.
-		if (language.id != Lang::Current().id()) {
+		const auto currentId = Lang::LanguageIdOrDefault(
+			Lang::Current().id());
+		if (language.id != currentId) {
 			Lang::CurrentCloudManager().switchToLanguage(language);
 			if (inner) {
-				inner->changeChosen(Lang::Current().id());
+				inner->changeChosen(currentId);
 			}
 		}
 	}, inner->lifetime());
diff --git a/Telegram/SourceFiles/storage/localstorage.cpp b/Telegram/SourceFiles/storage/localstorage.cpp
index 41b2ca8a6..c07e0ddbc 100644
--- a/Telegram/SourceFiles/storage/localstorage.cpp
+++ b/Telegram/SourceFiles/storage/localstorage.cpp
@@ -368,10 +368,10 @@ void start() {
 	_oldSettingsVersion = settingsData.version;
 	_settingsSalt = salt;
 
+	applyReadContext(std::move(context));
+
 	InitialLoadTheme();
 	readLangPack();
-
-	applyReadContext(std::move(context));
 }
 
 void writeSettings() {