diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-08-30 23:58:53 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-09-05 18:01:43 +1000 |
commit | 26204441b40591415855d971f87f2bed511ccd7d (patch) | |
tree | 1affa3bebe61e846f4de24b600be1fe9c373dfcd | |
parent | Remove offset argument to container_add_sibling (diff) | |
download | sway-26204441b40591415855d971f87f2bed511ccd7d.tar.gz sway-26204441b40591415855d971f87f2bed511ccd7d.tar.zst sway-26204441b40591415855d971f87f2bed511ccd7d.zip |
Apply default config to output
When starting without any output config, the default config was not
applying.
-rw-r--r-- | sway/desktop/output.c | 2 | ||||
-rw-r--r-- | sway/tree/output.c | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 792a7231..7e9f7b7e 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c | |||
@@ -547,7 +547,7 @@ void handle_new_output(struct wl_listener *listener, void *data) { | |||
547 | 547 | ||
548 | struct output_config *oc = output_find_config(output); | 548 | struct output_config *oc = output_find_config(output); |
549 | 549 | ||
550 | if (oc && oc->enabled) { | 550 | if (!oc || oc->enabled) { |
551 | output_enable(output, oc); | 551 | output_enable(output, oc); |
552 | } | 552 | } |
553 | 553 | ||
diff --git a/sway/tree/output.c b/sway/tree/output.c index afc336f8..35589032 100644 --- a/sway/tree/output.c +++ b/sway/tree/output.c | |||
@@ -253,9 +253,6 @@ struct output_config *output_find_config(struct sway_output *output) { | |||
253 | oc = all; | 253 | oc = all; |
254 | } | 254 | } |
255 | 255 | ||
256 | if (oc && !oc->enabled) { | ||
257 | return NULL; | ||
258 | } | ||
259 | return oc; | 256 | return oc; |
260 | } | 257 | } |
261 | 258 | ||