mirror of
https://github.com/warmcat/libwebsockets.git
synced 2025-03-16 00:00:07 +01:00
dbus: support adding disabled watchers
Dbus may add a watcher in a disabled state, don't action it if so on the lws event loop. It'll re-add if it wants it, confusingly.
This commit is contained in:
parent
d8c56ceb69
commit
0cdfd750ef
1 changed files with 3 additions and 2 deletions
|
@ -179,7 +179,7 @@ lws_dbus_add_watch(DBusWatch *w, void *data)
|
|||
}
|
||||
|
||||
for (n = 0; n < (int)LWS_ARRAY_SIZE(ctx->w); n++)
|
||||
if (ctx->w[n])
|
||||
if (ctx->w[n] && dbus_watch_get_enabled(ctx->w[n]))
|
||||
flags |= dbus_watch_get_flags(ctx->w[n]);
|
||||
|
||||
if (flags & DBUS_WATCH_READABLE)
|
||||
|
@ -190,7 +190,8 @@ lws_dbus_add_watch(DBusWatch *w, void *data)
|
|||
lwsl_info("%s: w %p, fd %d, data %p, flags %d\n", __func__, w,
|
||||
dbus_watch_get_unix_fd(w), data, lws_flags);
|
||||
|
||||
__lws_change_pollfd(wsi, 0, lws_flags);
|
||||
if (lws_flags)
|
||||
__lws_change_pollfd(wsi, 0, (int)lws_flags);
|
||||
|
||||
lws_pt_unlock(pt);
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue