From 381717a56846128d6367bf191d8aefa36a656179 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Wed, 24 Sep 2025 17:21:47 +0200
Subject: [PATCH] Fix Tasmota Discovery DeviceName Escape (#23941)

---
 tasmota/tasmota_xdrv_driver/xdrv_12_discovery.ino | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasmota/tasmota_xdrv_driver/xdrv_12_discovery.ino b/tasmota/tasmota_xdrv_driver/xdrv_12_discovery.ino
index 9fa2be99d..53f5f644b 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_12_discovery.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_12_discovery.ino
@@ -46,7 +46,7 @@ void TasDiscoverMessage(void) {
                    "\"dn\":\"%s\","                            // Device Name
                    "\"fn\":["),                                // Friendly Names (start)
                    ip_address,
-                   SettingsText(SET_DEVICENAME));
+                   EscapeJSONString(SettingsText(SET_DEVICENAME)).c_str());
 
   uint32_t maxfn = (TasmotaGlobal.devices_present > MAX_FRIENDLYNAMES) ? MAX_FRIENDLYNAMES : (!TasmotaGlobal.devices_present) ? 1 : TasmotaGlobal.devices_present;
   for (uint32_t i = 0; i < MAX_FRIENDLYNAMES; i++) {