StackRduino
diff --git a/‎ports/nrf/common-hal/_bleio/PacketBuffer.c‎
Lines changed: 8 additions & 2 deletions b/‎ports/nrf/common-hal/_bleio/PacketBuffer.c‎
Lines changed: 8 additions & 2 deletions
@@ -156,8 +156,7 @@ STATIC bool packet_buffer_on_ble_server_evt(ble_evt_t *ble_evt, void *param) {
                     return false;
                 }
                 write_to_ringbuf(self, evt_write->data, evt_write->len);
-            } else if (evt_write->handle == self->characteristic->cccd_handle &&
-                       self->conn_handle == BLE_CONN_HANDLE_INVALID) {
+            } else if (evt_write->handle == self->characteristic->cccd_handle) {
                 uint16_t cccd = *((uint16_t*) evt_write->data);
                 if (cccd & BLE_GATT_HVX_NOTIFICATION) {
                     self->conn_handle = conn_handle;
@@ -167,6 +166,11 @@ STATIC bool packet_buffer_on_ble_server_evt(ble_evt_t *ble_evt, void *param) {
             }
             break;
         }
+        case BLE_GAP_EVT_DISCONNECTED: {
+            if (self->conn_handle == conn_handle) {
+                self->conn_handle = BLE_CONN_HANDLE_INVALID;
+            }
+        }
         case BLE_GATTS_EVT_HVN_TX_COMPLETE: {
             queue_next_write(self);
         }
@@ -192,6 +196,8 @@ void common_hal_bleio_packet_buffer_construct(
         incoming = outgoing;
         outgoing = temp;
         self->conn_handle = bleio_connection_get_conn_handle(MP_OBJ_TO_PTR(self->characteristic->service->connection));
+    } else {
+        self->conn_handle = BLE_CONN_HANDLE_INVALID;
     }
 
     if (incoming) {
Original file line number	Diff line number	Diff line change
`@@ -156,8 +156,7 @@ STATIC bool packet_buffer_on_ble_server_evt(ble_evt_t ble_evt, void param) {`
`156`	`156`	`return false;`
`157`	`157`	`}`
`158`	`158`	`write_to_ringbuf(self, evt_write->data, evt_write->len);`
`159`		`- } else if (evt_write->handle == self->characteristic->cccd_handle &&`
`160`		`- self->conn_handle == BLE_CONN_HANDLE_INVALID) {`
	`159`	`+ } else if (evt_write->handle == self->characteristic->cccd_handle) {`
`161`	`160`	`uint16_t cccd = ((uint16_t) evt_write->data);`
`162`	`161`	`if (cccd & BLE_GATT_HVX_NOTIFICATION) {`
`163`	`162`	`self->conn_handle = conn_handle;`
`@@ -167,6 +166,11 @@ STATIC bool packet_buffer_on_ble_server_evt(ble_evt_t ble_evt, void param) {`
`167`	`166`	`}`
`168`	`167`	`break;`
`169`	`168`	`}`
	`169`	`+ case BLE_GAP_EVT_DISCONNECTED: {`
	`170`	`+ if (self->conn_handle == conn_handle) {`
	`171`	`+ self->conn_handle = BLE_CONN_HANDLE_INVALID;`
	`172`	`+ }`
	`173`	`+ }`
`170`	`174`	`case BLE_GATTS_EVT_HVN_TX_COMPLETE: {`
`171`	`175`	`queue_next_write(self);`
`172`	`176`	`}`
`@@ -192,6 +196,8 @@ void common_hal_bleio_packet_buffer_construct(`
`192`	`196`	`incoming = outgoing;`
`193`	`197`	`outgoing = temp;`
`194`	`198`	`self->conn_handle = bleio_connection_get_conn_handle(MP_OBJ_TO_PTR(self->characteristic->service->connection));`
	`199`	`+ } else {`
	`200`	`+ self->conn_handle = BLE_CONN_HANDLE_INVALID;`
`195`	`201`	`}`
`196`	`202`
`197`	`203`	`if (incoming) {`