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

Fix crash when disconnecting output
6 years ago · 08815f9cfb
parent a032925ae7 b1a0e95e8e
commit 08815f9cfb
1 changed files with 2 additions and 1 deletions
--- 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);