ScStw/esp-nimble-cpp
2
0
Fork 0
mirror of https://github.com/h2zero/esp-nimble-cpp.git synced 2024-11-21 20:50:55 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix(NimBLEDevice): clear all before port_deinit to prevent crash

Browse source
This commit is contained in:
William Emfinger 2024-09-06 08:52:04 -05:00 committed by h2zero
parent 91210b8610
commit 73f0277042
1 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/NimBLEDevice.cpp
View file

@ -920,20 +920,6 @@ void NimBLEDevice::init(const std::string &deviceName) {
*/ */
/* STATIC */ /* STATIC */
void NimBLEDevice::deinit(bool clearAll) { void NimBLEDevice::deinit(bool clearAll) {
int ret = nimble_port_stop();
if (ret == 0) {
nimble_port_deinit();
#ifdef CONFIG_NIMBLE_CPP_IDF
# if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0)
ret = esp_nimble_hci_and_controller_deinit();
if (ret != ESP_OK) {
NIMBLE_LOGE(LOG_TAG, "esp_nimble_hci_and_controller_deinit() failed with error: %d", ret);
}
# endif
#endif
initialized = false;
m_synced = false;
if(clearAll) { if(clearAll) {
#if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL) #if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
if(NimBLEDevice::m_pServer != nullptr) { if(NimBLEDevice::m_pServer != nullptr) {
@ -963,6 +949,20 @@ void NimBLEDevice::deinit(bool clearAll) {
#endif #endif
m_ignoreList.clear(); m_ignoreList.clear();
} }
int ret = nimble_port_stop();
if (ret == 0) {
nimble_port_deinit();
#ifdef CONFIG_NIMBLE_CPP_IDF
# if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0)
ret = esp_nimble_hci_and_controller_deinit();
if (ret != ESP_OK) {
NIMBLE_LOGE(LOG_TAG, "esp_nimble_hci_and_controller_deinit() failed with error: %d", ret);
}
# endif
#endif
initialized = false;
m_synced = false;
} }
} // deinit } // deinit