Fix task not released when not exchanging MTU.

h2zero · h2zero · commit 52291390fab4 · 2024-11-26T17:44:44.000-07:00
diff --git a/src/NimBLEClient.cpp b/src/NimBLEClient.cpp
@@ -987,6 +987,8 @@ int NimBLEClient::handleGapEvent(struct ble_gap_event* event, void* arg) {
                         rc = pClient->m_lastErr; // sets the error in the task data
                         break;
                     }
+
+                    return 0; // return as we may have a task waiting for the MTU before releasing it.
                 }
             } else {
                 pClient->m_connHandle = BLE_HS_CONN_HANDLE_NONE;
@@ -997,11 +999,9 @@ int NimBLEClient::handleGapEvent(struct ble_gap_event* event, void* arg) {
                         NimBLEDevice::deleteClient(pClient);
                     }
                 }
-
-                break;
             }
 
-            return 0;
+            break;
         } // BLE_GAP_EVENT_CONNECT
 
         case BLE_GAP_EVENT_TERM_FAILURE: {

Original file line number	Diff line number	Diff line change
`@@ -987,6 +987,8 @@ int NimBLEClient::handleGapEvent(struct ble_gap_event* event, void* arg) {`
`987`	`987`	`rc = pClient->m_lastErr; // sets the error in the task data`
`988`	`988`	`break;`
`989`	`989`	`}`
	`990`	`+`
	`991`	`+ return 0; // return as we may have a task waiting for the MTU before releasing it.`
`990`	`992`	`}`
`991`	`993`	`} else {`
`992`	`994`	`pClient->m_connHandle = BLE_HS_CONN_HANDLE_NONE;`
`@@ -997,11 +999,9 @@ int NimBLEClient::handleGapEvent(struct ble_gap_event* event, void* arg) {`
`997`	`999`	`NimBLEDevice::deleteClient(pClient);`
`998`	`1000`	`}`
`999`	`1001`	`}`
`1000`		`-`
`1001`		`- break;`
`1002`	`1002`	`}`
`1003`	`1003`
`1004`		`- return 0;`
	`1004`	`+ break;`
`1005`	`1005`	`} // BLE_GAP_EVENT_CONNECT`
`1006`	`1006`
`1007`	`1007`	`case BLE_GAP_EVENT_TERM_FAILURE: {`