aboutsummaryrefslogtreecommitdiff
path: root/sway/tree/output.c
diff options
context:
space:
mode:
Diffstat (limited to 'sway/tree/output.c')
-rw-r--r--sway/tree/output.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/sway/tree/output.c b/sway/tree/output.c
index 3c376c6b..21beb504 100644
--- a/sway/tree/output.c
+++ b/sway/tree/output.c
@@ -78,6 +78,12 @@ void output_enable(struct sway_output *output, struct output_config *oc) {
}
output->enabled = true;
+ if (!apply_output_config(oc, output)) {
+ output->enabled = false;
+ return;
+ }
+
+ output->configured = true;
list_add(root->outputs, output);
output->lx = wlr_output->lx;
@@ -104,8 +110,6 @@ void output_enable(struct sway_output *output, struct output_config *oc) {
ipc_event_workspace(NULL, ws, "init");
}
- apply_output_config(oc, output);
-
if (ws && config->default_orientation == L_NONE) {
// Since the output transformation and resolution could have changed
// due to applying the output config, the previously set layout for the