aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Dwyer <ryandwyer1@gmail.com>2018-08-30 23:58:53 +1000
committerRyan Dwyer <ryandwyer1@gmail.com>2018-09-05 18:01:43 +1000
commit26204441b40591415855d971f87f2bed511ccd7d (patch)
tree1affa3bebe61e846f4de24b600be1fe9c373dfcd
parent06d969382988e49c7308b43dd3740c8f363cb71f (diff)
downloadsway-26204441b40591415855d971f87f2bed511ccd7d.tar.xz
Apply default config to output
When starting without any output config, the default config was not applying.
-rw-r--r--sway/desktop/output.c2
-rw-r--r--sway/tree/output.c3
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) {
struct output_config *oc = output_find_config(output);
- if (oc && oc->enabled) {
+ if (!oc || oc->enabled) {
output_enable(output, oc);
}
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) {
oc = all;
}
- if (oc && !oc->enabled) {
- return NULL;
- }
return oc;
}