From c2ffd4e49a774e7d7bad0ff6bf2a27a84151f3f3 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Fri, 2 Jan 2026 20:28:37 -1000 Subject: [PATCH] fix merge conflict --- esphome/components/api/api_connection.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esphome/components/api/api_connection.cpp b/esphome/components/api/api_connection.cpp index cd28ec3027..f8e882cab1 100644 --- a/esphome/components/api/api_connection.cpp +++ b/esphome/components/api/api_connection.cpp @@ -1524,7 +1524,7 @@ void APIConnection::complete_authentication_() { bool APIConnection::send_hello_response(const HelloRequest &msg) { // Copy client name with truncation if needed (set_client_name handles truncation) - this->helper_->set_client_name(reinterpret_cast(msg.client_info), msg.client_info_len); + this->helper_->set_client_name(msg.client_info.data(), msg.client_info.size()); this->client_api_version_major_ = msg.api_version_major; this->client_api_version_minor_ = msg.api_version_minor; char peername[socket::PEERNAME_MAX_LEN];