Mirrors_Framework/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-05-31 17:06:40 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/ota_fix_abort' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2026-01-12 20:18:30 -10:00
parent a74cba61df 1a30851b0a
commit a95f2fb002
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/esphome/ota/ota_esphome.cpp
+3 -1
View File
@@ -370,12 +370,14 @@ void ESPHomeOTAComponent::handle_data_() {
error: error:
this->write_byte_(static_cast<uint8_t>(error_code)); this->write_byte_(static_cast<uint8_t>(error_code));
this->cleanup_connection_();
// Abort backend before cleanup - cleanup_connection_() destroys the backend
if (this->backend_ != nullptr && update_started) { if (this->backend_ != nullptr && update_started) {
this->backend_->abort(); this->backend_->abort();
} }
this->cleanup_connection_();
this->status_momentary_error("err", 5000); this->status_momentary_error("err", 5000);
#ifdef USE_OTA_STATE_LISTENER #ifdef USE_OTA_STATE_LISTENER
this->notify_state_(ota::OTA_ERROR, 0.0f, static_cast<uint8_t>(error_code)); this->notify_state_(ota::OTA_ERROR, 0.0f, static_cast<uint8_t>(error_code));