Merge pull request #2179 from atomnuker/master

Fix crash with stacking layout after f42bf0ad4
This commit is contained in:
emersion 2018-06-30 13:23:27 +01:00 committed by GitHub
commit 9ba72433b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -645,7 +645,7 @@ static void render_container_simple(struct sway_output *output,
if (child->sway_view->border == B_NORMAL) { if (child->sway_view->border == B_NORMAL) {
render_titlebar(output, damage, child, child->x, child->y, render_titlebar(output, damage, child, child->x, child->y,
child->width, colors, title_texture, marks_texture); child->width, colors, title_texture, marks_texture);
} else if (con->sway_view->border != B_NONE) { } else {
render_top_border(output, damage, child, colors); render_top_border(output, damage, child, colors);
} }
render_view(output, damage, child, colors); render_view(output, damage, child, colors);