Don't change owner if take() doesnt succeed (#3987)

c1a7198e · Bascy · GitHub · 4d4a1fde · c1a7198e
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

libraries/BLE/src/FreeRTOS.cpp libraries/BLE/src/FreeRTOS.cpp +2 -2

未找到文件。
--- a/libraries/BLE/src/FreeRTOS.cpp
+++ b/libraries/BLE/src/FreeRTOS.cpp
@@ -193,8 +193,8 @@ bool FreeRTOS::Semaphore::take(std::string owner) {
 	} else {
 		rc = ::xSemaphoreTake(m_semaphore, portMAX_DELAY) == pdTRUE;
 	}
-	m_owner = owner;
 	if (rc) {
+		m_owner = owner;
 		log_v("Semaphore taken:  %s", toString().c_str());
 	} else {
 		log_e("Semaphore NOT taken:  %s", toString().c_str());
@@ -218,8 +218,8 @@ bool FreeRTOS::Semaphore::take(uint32_t timeoutMs, std::string owner) {
 	} else {
 		rc = ::xSemaphoreTake(m_semaphore, timeoutMs / portTICK_PERIOD_MS) == pdTRUE;
 	}
-	m_owner = owner;
 	if (rc) {
+		m_owner = owner;
 		log_v("Semaphore taken:  %s", toString().c_str());
 	} else {
 		log_e("Semaphore NOT taken:  %s", toString().c_str());