diff options
author | Drew DeVault <sir@cmpwn.com> | 2016-06-10 08:20:25 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-10 08:20:25 -0400 |
commit | 318cef3c4894a7ffdf85fc4e0bb5e5816d0fd2d2 (patch) | |
tree | 022d42e3249ac77ef2791cbc646f8d7c4b81bcc7 | |
parent | Merge pull request #703 from thuck/variables_corner_cases (diff) | |
parent | trigger bg change on config reload (diff) | |
download | sway-318cef3c4894a7ffdf85fc4e0bb5e5816d0fd2d2.tar.gz sway-318cef3c4894a7ffdf85fc4e0bb5e5816d0fd2d2.tar.zst sway-318cef3c4894a7ffdf85fc4e0bb5e5816d0fd2d2.zip |
Merge pull request #706 from zandrmartin/swaybg-reload
trigger bg change on config reload
-rw-r--r-- | sway/commands.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sway/commands.c b/sway/commands.c index eab4a1c1..07e7e53d 100644 --- a/sway/commands.c +++ b/sway/commands.c | |||
@@ -1692,9 +1692,13 @@ static struct cmd_results *cmd_output(int argc, char **argv) { | |||
1692 | swayc_t *cont = NULL; | 1692 | swayc_t *cont = NULL; |
1693 | for (int i = 0; i < root_container.children->length; ++i) { | 1693 | for (int i = 0; i < root_container.children->length; ++i) { |
1694 | cont = root_container.children->items[i]; | 1694 | cont = root_container.children->items[i]; |
1695 | if (cont->name && strcmp(cont->name, output->name) == 0) { | 1695 | if (cont->name && ((strcmp(cont->name, output->name) == 0) || (strcmp(output->name, "*") == 0))) { |
1696 | apply_output_config(output, cont); | 1696 | apply_output_config(output, cont); |
1697 | break; | 1697 | |
1698 | if (strcmp(output->name, "*") != 0) { | ||
1699 | // stop looking if the output config isn't applicable to all outputs | ||
1700 | break; | ||
1701 | } | ||
1698 | } | 1702 | } |
1699 | } | 1703 | } |
1700 | } | 1704 | } |