From 6a6aa8867bed9e14a71f00e5f61770ee0db35b94 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 11 Apr 2022 10:49:16 +0200
Subject: [PATCH] [users] hostname.X takes precedence over legacy settings

---
 src/modules/users/Config.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp
index 6cc3a0cea..829d2114f 100644
--- a/src/modules/users/Config.cpp
+++ b/src/modules/users/Config.cpp
@@ -832,9 +832,16 @@ copyLegacy( const QVariantMap& source, const QString& sourceKey, QVariantMap& ta
 {
     if ( source.contains( sourceKey ) )
     {
-        const QVariant legacyValue = source.value( sourceKey );
-        cWarning() << "Legacy *users* key" << sourceKey << "overrides hostname-settings.";
-        target.insert( targetKey, legacyValue );
+        if ( target.contains( targetKey ) )
+        {
+            cWarning() << "Legacy *users* key" << sourceKey << "ignored.";
+        }
+        else
+        {
+            const QVariant legacyValue = source.value( sourceKey );
+            cWarning() << "Legacy *users* key" << sourceKey << "overrides hostname-settings.";
+            target.insert( targetKey, legacyValue );
+        }
     }
 }