Merge pull request #198 from nbd168/ubus-uloop-fix

ubus: fix uc_ubus_have_uloop for eloop+uloop combination

1 files changed, 5 insertions, 0 deletions

diff --git a/lib/ubus.c b/lib/ubus.c
index 981e337..36a5674 100644
--- a/lib/ubus.c
+++ b/lib/ubus.c
@@ -665,6 +665,11 @@ uc_ubus_have_uloop(void)
 	bool prev = uloop_cancelled;
 	bool active;
 
+#ifdef HAVE_ULOOP_FD_SET_CB
+	if (uloop_fd_set_cb)
+		return true;
+#endif
+
 	uloop_cancelled = true;
 	active = uloop_cancelling();
 	uloop_cancelled = prev;