From 445a09575ceffbb05b9045ecd0ce89a6c2e173dc Mon Sep 17 00:00:00 2001 From: Cédric Cabessa Date: Wed, 25 Jul 2018 17:06:50 +0200 Subject: fix #2355: "move workspace to output up" crashes when using 2 display, if scaling is different `container_update_textures_recursive` is called when moving workspace on different display. We need to call `container_update_title_textures` only for container of type "CONTAINER" or "VIEW" in order to be consistent with the assert in `update_title_texture`. --- sway/tree/container.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sway/tree/container.c b/sway/tree/container.c index b56b4e87..237e1a35 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -68,7 +68,9 @@ void container_create_notify(struct sway_container *container) { } static void container_update_textures_recursive(struct sway_container *con) { - container_update_title_textures(con); + if (con->type == C_CONTAINER || con->type == C_VIEW) { + container_update_title_textures(con); + } if (con->type == C_VIEW) { view_update_marks_textures(con->sway_view); -- cgit v1.2.3-54-g00ecf