Address emersions comments on output re-enabling

1 files changed, 2 insertions, 8 deletions

diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 5d02f5eb..cb53a980 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -1221,6 +1221,8 @@ void handle_new_output(struct wl_listener *listener, void *data) {
 	output->server = server;
 	list_add(root_container.sway_root->outputs, output);
 
+	output->damage = wlr_output_damage_create(wlr_output);
+
 	if (!wl_list_empty(&wlr_output->modes)) {
 		struct wlr_output_mode *mode =
 			wl_container_of(wlr_output->modes.prev, mode, link);
@@ -1233,14 +1235,6 @@ void handle_new_output(struct wl_listener *listener, void *data) {
 void output_enable(struct sway_output *output) {
 	struct wlr_output *wlr_output = output->wlr_output;
 
-	if (!wlr_output->data) {
-		wlr_output->data = output;
-	}
-
-	if (!output->damage) {
-		output->damage = wlr_output_damage_create(wlr_output);
-	}
-
 	output->swayc = output_create(output);
 	if (!output->swayc) {
 		// Output is disabled