Merge pull request #1876 from RyanDwyer/view-unmap-segfault

Fix segfault in view_unmap()
This commit is contained in:
emersion 2018-05-01 08:35:08 +01:00 committed by GitHub
commit bf0603cd2d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -302,8 +302,12 @@ void view_unmap(struct sway_view *view) {
view->swayc = NULL; view->swayc = NULL;
view->surface = NULL; view->surface = NULL;
if (parent->type == C_OUTPUT) {
arrange_output(parent);
} else {
arrange_children_of(parent); arrange_children_of(parent);
} }
}
void view_update_position(struct sway_view *view, double ox, double oy) { void view_update_position(struct sway_view *view, double ox, double oy) {
if (view->swayc->x == ox && view->swayc->y == oy) { if (view->swayc->x == ox && view->swayc->y == oy) {