From 5420b3c9c91378ab855703ce21c0e424dd150f38 Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Tue, 9 Jun 2020 17:48:59 +0100
Subject: [PATCH] eloop: Fix making the initial event listener

---
 src/eloop.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/eloop.c b/src/eloop.c
index 133283d3..ae63241e 100644
--- a/src/eloop.c
+++ b/src/eloop.c
@@ -336,8 +336,13 @@ eloop_event_add_rw(struct eloop *eloop, int fd,
 				return -1;
 		}
 		TAILQ_INSERT_HEAD(&eloop->events, e, next);
-		e->fd = fd;
 		eloop->nevents++;
+		e->fd = fd;
+		e->read_cb = read_cb;
+		e->read_cb_arg = read_cb_arg;
+		e->write_cb = write_cb;
+		e->write_cb_arg = write_cb_arg;
+		goto setup;
 	}
 
 	if (read_cb) {
@@ -349,6 +354,7 @@ eloop_event_add_rw(struct eloop *eloop, int fd,
 		e->write_cb_arg = write_cb_arg;
 	}
 
+setup:
 	eloop_event_setup_fds(eloop);
 	return 0;
 }
-- 
2.47.2