From 83e1dd285af04a1edcc9344bc9316d30f036cadd Mon Sep 17 00:00:00 2001 From: Philipp David Date: Mon, 17 Jan 2022 09:49:47 +0100 Subject: [PATCH] Set default lang only if index received --- launcher/translations/TranslationsModel.cpp | 25 ++++++++++++--------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/launcher/translations/TranslationsModel.cpp b/launcher/translations/TranslationsModel.cpp index 0cf4d548..0fa82e35 100644 --- a/launcher/translations/TranslationsModel.cpp +++ b/launcher/translations/TranslationsModel.cpp @@ -169,10 +169,22 @@ TranslationsModel::~TranslationsModel() void TranslationsModel::translationDirChanged(const QString& path) { qDebug() << "Dir changed:" << path; - reloadLocalFiles(); + if (!d->no_language_set) + { + reloadLocalFiles(); + } + selectLanguage(selectedLanguage()); +} + +void TranslationsModel::indexReceived() +{ + qDebug() << "Got translations index!"; + d->m_index_job.reset(); if (d->no_language_set) { + reloadLocalFiles(); + auto language = d->m_system_locale; if (!findLanguage(language)) { @@ -186,17 +198,8 @@ void TranslationsModel::translationDirChanged(const QString& path) APPLICATION->settings()->set("Language", selectedLanguage()); d->no_language_set = false; } - else - { - selectLanguage(selectedLanguage()); - } -} -void TranslationsModel::indexReceived() -{ - qDebug() << "Got translations index!"; - d->m_index_job.reset(); - if(d->m_selectedLanguage != defaultLangCode) + else if(d->m_selectedLanguage != defaultLangCode) { downloadTranslation(d->m_selectedLanguage); }