From 1c9d966b0ce3574f0baf16201161f3c68d22c556 Mon Sep 17 00:00:00 2001
From: Garrett D'Amore <garrett@damore.org>
Date: Mon, 6 Aug 2018 23:00:42 +0300
Subject: fixes #623 nni_aio_stop could be better

---
 src/core/aio.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/core/aio.c b/src/core/aio.c
index 40638bce..294a0b92 100644
--- a/src/core/aio.c
+++ b/src/core/aio.c
@@ -217,11 +217,17 @@ void
 nni_aio_stop(nni_aio *aio)
 {
 	if (aio != NULL) {
+		nni_aio_cancelfn cancelfn;
+
 		nni_mtx_lock(&nni_aio_lk);
-		aio->a_stop = true;
+		cancelfn           = aio->a_prov_cancel;
+		aio->a_prov_cancel = NULL;
+		aio->a_stop        = true;
 		nni_mtx_unlock(&nni_aio_lk);
 
-		nni_aio_abort(aio, NNG_ECANCELED);
+		if (cancelfn != NULL) {
+			cancelfn(aio, NNG_ECANCELED);
+		}
 
 		nni_aio_wait(aio);
 	}
-- 
cgit v1.2.3-70-g09d2