aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Cédric Cabessa <ced@ryick.net>2018-07-25 17:06:50 +0200
committerLibravatar Cédric Cabessa <ced@ryick.net>2018-07-25 17:06:50 +0200
commit445a09575ceffbb05b9045ecd0ce89a6c2e173dc (patch)
tree18aa3e845dbe44b0bbe245063af591b940126970
parentMerge pull request #2353 from emersion/render-opaque-overlay (diff)
downloadsway-445a09575ceffbb05b9045ecd0ce89a6c2e173dc.tar.gz
sway-445a09575ceffbb05b9045ecd0ce89a6c2e173dc.tar.zst
sway-445a09575ceffbb05b9045ecd0ce89a6c2e173dc.zip
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`.
-rw-r--r--sway/tree/container.c4
1 files changed, 3 insertions, 1 deletions
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) {
68} 68}
69 69
70static void container_update_textures_recursive(struct sway_container *con) { 70static void container_update_textures_recursive(struct sway_container *con) {
71 container_update_title_textures(con); 71 if (con->type == C_CONTAINER || con->type == C_VIEW) {
72 container_update_title_textures(con);
73 }
72 74
73 if (con->type == C_VIEW) { 75 if (con->type == C_VIEW) {
74 view_update_marks_textures(con->sway_view); 76 view_update_marks_textures(con->sway_view);