Update BLEScan.cpp (#5241)

Ben79543 · web-flow · commit e7d0ad2efd9d · 2021-06-09T12:40:59.000+03:00
Proposed fix to #4627 as a remediation to PR #3995 #3995 introduced that a device detected on BLE would not be entered in vector if a callback has been defined. By doing so, it was not possible anymore to have a counter in a call back (AND device in vector) to limit the number of detected device in a single scan, which could crash ESP32 as a result.
diff --git a/libraries/BLE/src/BLEScan.cpp b/libraries/BLE/src/BLEScan.cpp
@@ -126,7 +126,8 @@ void BLEScan::handleGAPEvent(
 
 					if (m_pAdvertisedDeviceCallbacks) { // if has callback, no need to record to vector
 						m_pAdvertisedDeviceCallbacks->onResult(*advertisedDevice);
-					} else if (!m_wantDuplicates && !found) {   // if no callback and not want duplicate, and not already in vector, record it
+					} 
+					if (!m_wantDuplicates && !found) {   // if no callback and not want duplicate, and not already in vector, record it
 						m_scanResults.m_vectorAdvertisedDevices.insert(std::pair<std::string, BLEAdvertisedDevice*>(advertisedAddress.toString(), advertisedDevice));
 						shouldDelete = false;
 					}

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,8 @@ void BLEScan::handleGAPEvent(`
`126`	`126`
`127`	`127`	`if (m_pAdvertisedDeviceCallbacks) { // if has callback, no need to record to vector`
`128`	`128`	`m_pAdvertisedDeviceCallbacks->onResult(*advertisedDevice);`
`129`		`- } else if (!m_wantDuplicates && !found) { // if no callback and not want duplicate, and not already in vector, record it`
	`129`	`+ }`
	`130`	`+ if (!m_wantDuplicates && !found) { // if no callback and not want duplicate, and not already in vector, record it`
`130`	`131`	`m_scanResults.m_vectorAdvertisedDevices.insert(std::pair<std::string, BLEAdvertisedDevice*>(advertisedAddress.toString(), advertisedDevice));`
`131`	`132`	`shouldDelete = false;`
`132`	`133`	`}`