summaryrefslogtreecommitdiffstats
path: root/sway/tree
diff options
context:
space:
mode:
Diffstat (limited to 'sway/tree')
-rw-r--r--sway/tree/output.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/sway/tree/output.c b/sway/tree/output.c
index d2ede1f2..6f4146cd 100644
--- a/sway/tree/output.c
+++ b/sway/tree/output.c
@@ -105,9 +105,9 @@ struct sway_output *output_create(struct wlr_output *wlr_output) {
105 return output; 105 return output;
106} 106}
107 107
108bool output_enable(struct sway_output *output, struct output_config *oc) { 108void output_enable(struct sway_output *output) {
109 if (!sway_assert(!output->enabled, "output is already enabled")) { 109 if (!sway_assert(!output->enabled, "output is already enabled")) {
110 return false; 110 return;
111 } 111 }
112 struct wlr_output *wlr_output = output->wlr_output; 112 struct wlr_output *wlr_output = output->wlr_output;
113 size_t len = sizeof(output->layers) / sizeof(output->layers[0]); 113 size_t len = sizeof(output->layers) / sizeof(output->layers[0]);
@@ -116,11 +116,6 @@ bool output_enable(struct sway_output *output, struct output_config *oc) {
116 } 116 }
117 117
118 output->enabled = true; 118 output->enabled = true;
119 if (!apply_output_config(oc, output)) {
120 output->enabled = false;
121 return false;
122 }
123
124 output->configured = true; 119 output->configured = true;
125 list_add(root->outputs, output); 120 list_add(root->outputs, output);
126 121
@@ -156,8 +151,6 @@ bool output_enable(struct sway_output *output, struct output_config *oc) {
156 151
157 arrange_layers(output); 152 arrange_layers(output);
158 arrange_root(); 153 arrange_root();
159
160 return true;
161} 154}
162 155
163static void evacuate_sticky(struct sway_workspace *old_ws, 156static void evacuate_sticky(struct sway_workspace *old_ws,