aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp David <pd@3b.pm>2022-01-17 09:49:47 +0100
committerPhilipp David <pd@3b.pm>2022-01-17 09:52:04 +0100
commit83e1dd285af04a1edcc9344bc9316d30f036cadd (patch)
tree4be30a399615f366960ca14d78428004aadaefb8
parentb9beb3c7d27f41b601c37caf94044015b0a80cc7 (diff)
downloadPrismLauncher-83e1dd285af04a1edcc9344bc9316d30f036cadd.tar.gz
PrismLauncher-83e1dd285af04a1edcc9344bc9316d30f036cadd.tar.bz2
PrismLauncher-83e1dd285af04a1edcc9344bc9316d30f036cadd.zip
Set default lang only if index received
-rw-r--r--launcher/translations/TranslationsModel.cpp25
1 files 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);
}