diff options
author | emersion <contact@emersion.fr> | 2018-06-30 13:23:27 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-30 13:23:27 +0100 |
commit | 9ba72433b6c87086f2772405e09e8ac8c0136a01 (patch) | |
tree | 97225bd4edf6f26d59761d78024a9abf199e2457 | |
parent | Merge pull request #2175 from apreiml/fix-swaymsg-error-output (diff) | |
parent | Fix crash with stacking layout after f42bf0ad4 (diff) | |
download | sway-9ba72433b6c87086f2772405e09e8ac8c0136a01.tar.gz sway-9ba72433b6c87086f2772405e09e8ac8c0136a01.tar.zst sway-9ba72433b6c87086f2772405e09e8ac8c0136a01.zip |
Merge pull request #2179 from atomnuker/master
Fix crash with stacking layout after f42bf0ad4
-rw-r--r-- | sway/desktop/output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index e1c44a28..6244ca4a 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c | |||
@@ -645,7 +645,7 @@ static void render_container_simple(struct sway_output *output, | |||
645 | if (child->sway_view->border == B_NORMAL) { | 645 | if (child->sway_view->border == B_NORMAL) { |
646 | render_titlebar(output, damage, child, child->x, child->y, | 646 | render_titlebar(output, damage, child, child->x, child->y, |
647 | child->width, colors, title_texture, marks_texture); | 647 | child->width, colors, title_texture, marks_texture); |
648 | } else if (con->sway_view->border != B_NONE) { | 648 | } else { |
649 | render_top_border(output, damage, child, colors); | 649 | render_top_border(output, damage, child, colors); |
650 | } | 650 | } |
651 | render_view(output, damage, child, colors); | 651 | render_view(output, damage, child, colors); |