sway

commit 08815f9cfb4d0e93d69997cb229333326212744b
parent a032925ae7667e917f2bd8d1b77de97b400b3bf7
Author: emersion <contact@emersion.fr>
Date:   Tue, 25 Sep 2018 09:36:25 +0200

Merge pull request #2708 from RyanDwyer/fix-output-disconnect-crash

Fix crash when disconnecting output
Diffstat:
M
sway/tree/container.c
 | 
3
++-

1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sway/tree/container.c b/sway/tree/container.c
@@ -985,7 +985,8 @@ void container_discover_outputs(struct sway_container *con) {
 		}
 	}
 	struct sway_output *new_output = container_get_effective_output(con);
-	double old_scale = old_output ? old_output->wlr_output->scale : -1;
+	double old_scale = old_output && old_output->enabled ?
+		old_output->wlr_output->scale : -1;
 	double new_scale = new_output ? new_output->wlr_output->scale : -1;
 	if (old_scale != new_scale) {
 		container_update_title_textures(con);