From 920d54afeb1606e1cb39c93e3a8eeda778f58d78 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sun, 31 Aug 2025 08:00:57 +0200 Subject: [PATCH] [Network] Fix merge-conflict on ESP32-build --- src/src/ESPEasyCore/Controller.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/src/ESPEasyCore/Controller.cpp b/src/src/ESPEasyCore/Controller.cpp index 4f8a8f047..dcf82ccb4 100644 --- a/src/src/ESPEasyCore/Controller.cpp +++ b/src/src/ESPEasyCore/Controller.cpp @@ -668,7 +668,7 @@ void MQTT_execute_connect_task(void *parameter) LoadControllerSettings(MQTT_task_data->ControllerIndex, *ControllerSettings); uint32_t timeout = ControllerSettings->MustCheckReply - ? WiFiEventData.getSuggestedTimeout(Settings.Protocol[MQTT_task_data->ControllerIndex], ControllerSettings->ClientTimeout) + ? ControllerSettings->getSuggestedTimeout(Settings.Protocol[MQTT_task_data->ControllerIndex]) : ControllerSettings->ClientTimeout; uint8_t incr = 5; // Increment timeout between connection attempts 5 times by 100 msec