sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-31 15:12:06 +00:00
Code Issues Releases Wiki Activity

bot comments

Browse Source
This commit is contained in:
J. Nick Koston
2025-09-26 09:43:36 -05:00
parent baf09e2eed
commit fb3ce6c783
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
esphome/components/esp32_ble_server/ble_characteristic.cpp
View File

@@ -313,10 +313,8 @@ void BLECharacteristic::remove_client_from_notify_list_(uint16_t conn_id) {
// for the common case by swapping with the last element and popping // for the common case by swapping with the last element and popping
for (size_t i = 0; i < this->clients_to_notify_.size(); i++) { for (size_t i = 0; i < this->clients_to_notify_.size(); i++) {
if (this->clients_to_notify_[i].conn_id == conn_id) { if (this->clients_to_notify_[i].conn_id == conn_id) {
// Swap with last element and pop // Swap with last element and pop (safe even when i is the last element)
if (i != this->clients_to_notify_.size() - 1) {
this->clients_to_notify_[i] = this->clients_to_notify_.back(); this->clients_to_notify_[i] = this->clients_to_notify_.back();
}
this->clients_to_notify_.pop_back(); this->clients_to_notify_.pop_back();
return; return;
} }

4
esphome/components/esp32_ble_server/ble_server_automations.cpp
View File

@@ -83,10 +83,8 @@ void BLECharacteristicSetValueActionManager::remove_listener_(BLECharacteristic
// Since we typically have very few listeners, optimize by swapping with back and popping // Since we typically have very few listeners, optimize by swapping with back and popping
for (size_t i = 0; i < this->listeners_.size(); i++) { for (size_t i = 0; i < this->listeners_.size(); i++) {
if (this->listeners_[i].characteristic == characteristic) { if (this->listeners_[i].characteristic == characteristic) {
// Swap with last element and pop // Swap with last element and pop (safe even when i is the last element)
if (i != this->listeners_.size() - 1) {
this->listeners_[i] = this->listeners_.back(); this->listeners_[i] = this->listeners_.back();
}
this->listeners_.pop_back(); this->listeners_.pop_back();
return; return;
} }