From e4cb4d1b5cd32e9455243ee7138bf007343269c2 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 17 Sep 2016 17:25:45 +1000 Subject: Fix swaybar when running on named outputs. When using a bar on a named output, load_swaybars() requires the output to be active (ie. in the root container), but this is not the case if the bar is added to the last output. To fix this, load_swaybars() is now called after the output has been added to the root container. After fixing that, swaybar would segfault due to using the wrong index variable when loading outputs and config. --- sway/config.c | 3 --- sway/container.c | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'sway') diff --git a/sway/config.c b/sway/config.c index a187fe3e..c0fbd210 100644 --- a/sway/config.c +++ b/sway/config.c @@ -936,9 +936,6 @@ void apply_output_config(struct output_config *oc, swayc_t *output) { execvp(cmd[0], cmd); } } - - // reload swaybars - load_swaybars(); } char *do_var_replacement(char *str) { diff --git a/sway/container.c b/sway/container.c index 5614293c..561dcba6 100644 --- a/sway/container.c +++ b/sway/container.c @@ -156,6 +156,7 @@ swayc_t *new_output(wlc_handle handle) { apply_output_config(oc, output); add_child(&root_container, output); + load_swaybars(); // Create workspace char *ws_name = NULL; -- cgit v1.2.3-54-g00ecf