From cf227490d791f007d0f630d7daf6fccd9b86472e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 11 Dec 2018 16:00:24 +0400
Subject: [PATCH] Fix using of base langpack for custom languages.

---
 Telegram/SourceFiles/lang/lang_cloud_manager.cpp | 1 -
 Telegram/SourceFiles/lang/lang_instance.cpp      | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/lang/lang_cloud_manager.cpp b/Telegram/SourceFiles/lang/lang_cloud_manager.cpp
index c26d1bb7a..7df317682 100644
--- a/Telegram/SourceFiles/lang/lang_cloud_manager.cpp
+++ b/Telegram/SourceFiles/lang/lang_cloud_manager.cpp
@@ -221,7 +221,6 @@ mtpRequestId CloudManager::packRequestId(Pack pack) const {
 }
 
 void CloudManager::requestLangPackDifference(Pack pack) {
-	const auto base = (pack == Pack::Base);
 	request(base::take(packRequestId(pack))).cancel();
 	if (_langpack.isCustom()) {
 		return;
diff --git a/Telegram/SourceFiles/lang/lang_instance.cpp b/Telegram/SourceFiles/lang/lang_instance.cpp
index c9bca71aa..8d1fc347e 100644
--- a/Telegram/SourceFiles/lang/lang_instance.cpp
+++ b/Telegram/SourceFiles/lang/lang_instance.cpp
@@ -268,7 +268,7 @@ void Instance::setBaseId(const QString &baseId, const QString &pluralId) {
 		if (!_base) {
 			_base = std::make_unique<Instance>(this, PrivateTag{});
 		}
-		_base->switchToId({ baseId, _pluralId });
+		_base->switchToId({ baseId, pluralId });
 	}
 }
 
@@ -513,6 +513,8 @@ void Instance::fillFromSerialized(
 				"Could not read data from serialized langpack."));
 			return;
 		}
+	} else {
+		stream >> base;
 	}
 	if (!base.isEmpty()) {
 		_base = std::make_unique<Instance>(this, PrivateTag{});