void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix language and theme writing / reading.

Browse source
This commit is contained in:
John Preston 2020-06-15 13:35:35 +04:00
parent f450f81215
commit dddd355f6c
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Telegram/SourceFiles/boxes/language_box.cpp
View file

@ -1100,10 +1100,12 @@ void LanguageBox::prepare() {
) | rpl::start_with_next([=](const Language &language) { ) | rpl::start_with_next([=](const Language &language) {
// "#custom" is applied each time it's passed to switchToLanguage(). // "#custom" is applied each time it's passed to switchToLanguage().
// So we check that the language really has changed. // 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); Lang::CurrentCloudManager().switchToLanguage(language);
if (inner) { if (inner) {
inner->changeChosen(Lang::Current().id()); inner->changeChosen(currentId);
} }
} }
}, inner->lifetime()); }, inner->lifetime());

4
Telegram/SourceFiles/storage/localstorage.cpp
View file

@ -368,10 +368,10 @@ void start() {
_oldSettingsVersion = settingsData.version; _oldSettingsVersion = settingsData.version;
_settingsSalt = salt; _settingsSalt = salt;
applyReadContext(std::move(context));
InitialLoadTheme(); InitialLoadTheme();
readLangPack(); readLangPack();
applyReadContext(std::move(context));
} }
void writeSettings() { void writeSettings() {