From ee8fa9f328665233827d2cd220cd29c6f91c8cfd Mon Sep 17 00:00:00 2001
From: ford-jones <fordnicholasjones@gmail.com>
Date: Tue, 30 Sep 2025 18:04:42 +1300
Subject: [PATCH] Use user preferences root topic if present

---
 src/modules/AdminModule.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/modules/AdminModule.cpp b/src/modules/AdminModule.cpp
index 1cea85d7a..8421e3bea 100644
--- a/src/modules/AdminModule.cpp
+++ b/src/modules/AdminModule.cpp
@@ -776,7 +776,11 @@ void AdminModule::handleSetConfig(const meshtastic_Config &c)
             initRegion();
 
             //  subscribe to appropriate MQTT root topic for this region
+#ifdef USERPREFS_MQTT_ROOT_TOPIC
+            sprintf(moduleConfig.mqtt.root, "%s/%s", USERPREFS_MQTT_ROOT_TOPIC, myRegion->name);
+#else
             sprintf(moduleConfig.mqtt.root, "%s/%s", default_mqtt_root, myRegion->name);
+#endif
             changes = SEGMENT_CONFIG | SEGMENT_MODULECONFIG;
         }
         break;