From 71ca1e154438b62deddeb5505509c9321d3eb288 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Thu, 6 Aug 2020 15:49:55 +0200
Subject: [PATCH] [localeq] Pick up Config changes before showing the module

---
 src/modules/localeq/LocaleQmlViewStep.cpp | 9 ++++++++-
 src/modules/localeq/LocaleQmlViewStep.h   | 2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/modules/localeq/LocaleQmlViewStep.cpp b/src/modules/localeq/LocaleQmlViewStep.cpp
index ead2e2673..cbcc5f78e 100644
--- a/src/modules/localeq/LocaleQmlViewStep.cpp
+++ b/src/modules/localeq/LocaleQmlViewStep.cpp
@@ -79,9 +79,16 @@ LocaleQmlViewStep::jobs() const
     return m_config->createJobs();
 }
 
+void
+LocaleQmlViewStep::onActivate()
+{
+    m_config->setCurrentLocation();  // Finalize the location
+    QmlViewStep::onActivate();
+}
+
 void
 LocaleQmlViewStep::setConfigurationMap( const QVariantMap& configurationMap )
 {
     m_config->setConfigurationMap( configurationMap );
-    Calamares::QmlViewStep::setConfigurationMap( configurationMap );  // call parent implementation last
+    QmlViewStep::setConfigurationMap( configurationMap );  // call parent implementation last
 }
diff --git a/src/modules/localeq/LocaleQmlViewStep.h b/src/modules/localeq/LocaleQmlViewStep.h
index 3d73c6f79..e2b8a9e13 100644
--- a/src/modules/localeq/LocaleQmlViewStep.h
+++ b/src/modules/localeq/LocaleQmlViewStep.h
@@ -43,6 +43,8 @@ public:
     bool isAtBeginning() const override;
     bool isAtEnd() const override;
 
+    virtual void onActivate() override;
+
     Calamares::JobList jobs() const override;
 
     void setConfigurationMap( const QVariantMap& configurationMap ) override;