pauljako/yambar
1
0
Fork 0
forked from external/yambar
Code Pull requests Activity

module/xkb: signal module-ready when failing early

Browse source
This commit is contained in:
Daniel Eklöf 2018-12-26 11:42:42 +01:00
parent b2121070f8
commit 6d75fe64ef
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
modules/xkb/xkb.c
View file

@ -387,27 +387,27 @@ talk_to_xkb(struct module_run_context *ctx, xcb_connection_t *conn)
const struct bar *bar = ctx->module->bar; const struct bar *bar = ctx->module->bar;
if (!xkb_enable(conn)) if (!xkb_enable(conn))
return false; goto err;
if (!register_for_events(conn)) if (!register_for_events(conn))
return false; goto err;
int xkb_event_base = get_xkb_event_base(conn); int xkb_event_base = get_xkb_event_base(conn);
if (xkb_event_base == -1) if (xkb_event_base == -1)
return false; goto err;
int current = get_current_layout(conn); int current = get_current_layout(conn);
if (current == -1) if (current == -1)
return false; goto err;
struct layouts layouts = get_layouts(conn); struct layouts layouts = get_layouts(conn);
if (layouts.count == -1) if (layouts.count == -1)
return false; goto err;
if (current >= layouts.count) { if (current >= layouts.count) {
LOG_ERR("current layout index: %d >= %zd", current, layouts.count); LOG_ERR("current layout index: %d >= %zd", current, layouts.count);
free_layouts(layouts); free_layouts(layouts);
return false; goto err;
} }
m->layouts = layouts; m->layouts = layouts;
@ -416,15 +416,19 @@ talk_to_xkb(struct module_run_context *ctx, xcb_connection_t *conn)
module_signal_ready(ctx); module_signal_ready(ctx);
return event_loop(ctx, conn, xkb_event_base); return event_loop(ctx, conn, xkb_event_base);
err:
module_signal_ready(ctx);
return false;
} }
static int static int
run(struct module_run_context *ctx) run(struct module_run_context *ctx)
{ {
//struct private *m = ctx->module->private;
xcb_connection_t *conn = xcb_connect(NULL, NULL); xcb_connection_t *conn = xcb_connect(NULL, NULL);
if (conn == NULL) { if (conn == NULL) {
LOG_ERR("failed to connect to X server"); LOG_ERR("failed to connect to X server");
module_signal_ready(ctx);
return EXIT_FAILURE; return EXIT_FAILURE;
} }