mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-14 06:24:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix swaybar when running on named outputs.

Browse Source 
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.
This commit is contained in:
Ryan Dwyer 2016-09-17 17:25:45 +10:00
parent 461e250e26
commit e4cb4d1b5c
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sway/config.c
View File

@ -936,9 +936,6 @@ void apply_output_config(struct output_config *oc, swayc_t *output) {
execvp(cmd[0], cmd); execvp(cmd[0], cmd);
} }
} }
// reload swaybars
load_swaybars();
} }
char *do_var_replacement(char *str) { char *do_var_replacement(char *str) {

1
sway/container.c
View File

@ -156,6 +156,7 @@ swayc_t *new_output(wlc_handle handle) {
apply_output_config(oc, output); apply_output_config(oc, output);
add_child(&root_container, output); add_child(&root_container, output);
load_swaybars();
// Create workspace // Create workspace
char *ws_name = NULL; char *ws_name = NULL;

2
swaybar/ipc.c
View File

@ -278,7 +278,7 @@ void ipc_bar_init(struct bar *bar, const char *bar_id) {
} else { } else {
int j = 0; int j = 0;
for (j = 0; j < bar->config->outputs->length; ++j) { for (j = 0; j < bar->config->outputs->length; ++j) {
const char *conf_name = bar->config->outputs->items[i]; const char *conf_name = bar->config->outputs->items[j];
if (strcasecmp(name, conf_name) == 0) { if (strcasecmp(name, conf_name) == 0) {
use_output = true; use_output = true;
break; break;