summaryrefslogtreecommitdiffstats
path: root/swaybar
diff options
context:
space:
mode:
authorLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2016-09-17 17:25:45 +1000
committerLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2016-09-17 17:25:45 +1000
commite4cb4d1b5cd32e9455243ee7138bf007343269c2 (patch)
tree1c96a901a341a314be49844080fdb813b2e7f8b5 /swaybar
parentMerge pull request #902 from zandrmartin/patch-2 (diff)
downloadsway-e4cb4d1b5cd32e9455243ee7138bf007343269c2.tar.gz
sway-e4cb4d1b5cd32e9455243ee7138bf007343269c2.tar.zst
sway-e4cb4d1b5cd32e9455243ee7138bf007343269c2.zip
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.
Diffstat (limited to 'swaybar')
-rw-r--r--swaybar/ipc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/swaybar/ipc.c b/swaybar/ipc.c
index bce9dc79..2c092853 100644
--- a/swaybar/ipc.c
+++ b/swaybar/ipc.c
@@ -278,7 +278,7 @@ void ipc_bar_init(struct bar *bar, const char *bar_id) {
278 } else { 278 } else {
279 int j = 0; 279 int j = 0;
280 for (j = 0; j < bar->config->outputs->length; ++j) { 280 for (j = 0; j < bar->config->outputs->length; ++j) {
281 const char *conf_name = bar->config->outputs->items[i]; 281 const char *conf_name = bar->config->outputs->items[j];
282 if (strcasecmp(name, conf_name) == 0) { 282 if (strcasecmp(name, conf_name) == 0) {
283 use_output = true; 283 use_output = true;
284 break; 284 break;