From 26204441b40591415855d971f87f2bed511ccd7d Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Thu, 30 Aug 2018 23:58:53 +1000
Subject: [PATCH] Apply default config to output

When starting without any output config, the default config was not
applying.
---
 sway/desktop/output.c | 2 +-
 sway/tree/output.c    | 3 ---
 2 files changed, 1 insertion(+), 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;
 }