X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-ws.c;h=454ddc1a62a8b34861986cb7117713b6b5f9eec9;hb=ad66a4685f5d50ef05338157c84a572088693ed3;hp=ef73addd0c78681ce48a4541b094b07b8dbe89f7;hpb=ca820c65c2b03a24e8936218171c6c1d138fd1f7;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-ws.c b/src/afb-ws.c
index ef73addd..454ddc1a 100644
--- a/src/afb-ws.c
+++ b/src/afb-ws.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017 "IoT.bzh"
+ * Copyright (C) 2016, 2017, 2018 "IoT.bzh"
  * Author: José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -120,6 +120,7 @@ static void aws_disconnect(struct afb_ws *ws, int call_on_hangup)
 	struct websock *wsi = ws->ws;
 	if (wsi != NULL) {
 		ws->ws = NULL;
+		fdev_set_callback(ws->fdev, NULL, 0);
 		fdev_unref(ws->fdev);
 		websock_destroy(wsi);
 		free(ws->buffer.buffer);
@@ -133,7 +134,7 @@ static void fdevcb(void *ws, uint32_t revents, struct fdev *fdev)
 {
 	if ((revents & EPOLLIN) != 0)
 		aws_on_readable(ws);
-	if ((revents & EPOLLHUP) != 0)
+	else if ((revents & EPOLLHUP) != 0)
 		afb_ws_hangup(ws);
 }