diff options
author | emersion <contact@emersion.fr> | 2018-05-01 08:35:08 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-01 08:35:08 +0100 |
commit | bf0603cd2d905554cc57d121b56b6708bb1d382b (patch) | |
tree | 063cd3e299a7cf6f2aeca70c9019a26d642c558f | |
parent | Merge pull request #1873 from RyanDwyer/remove-arrange-windows (diff) | |
parent | Fix segfault in view_unmap() (diff) | |
download | sway-bf0603cd2d905554cc57d121b56b6708bb1d382b.tar.gz sway-bf0603cd2d905554cc57d121b56b6708bb1d382b.tar.zst sway-bf0603cd2d905554cc57d121b56b6708bb1d382b.zip |
Merge pull request #1876 from RyanDwyer/view-unmap-segfault
Fix segfault in view_unmap()
-rw-r--r-- | sway/tree/view.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sway/tree/view.c b/sway/tree/view.c index e0aa6c0c..519c3c78 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c | |||
@@ -302,7 +302,11 @@ void view_unmap(struct sway_view *view) { | |||
302 | view->swayc = NULL; | 302 | view->swayc = NULL; |
303 | view->surface = NULL; | 303 | view->surface = NULL; |
304 | 304 | ||
305 | arrange_children_of(parent); | 305 | if (parent->type == C_OUTPUT) { |
306 | arrange_output(parent); | ||
307 | } else { | ||
308 | arrange_children_of(parent); | ||
309 | } | ||
306 | } | 310 | } |
307 | 311 | ||
308 | void view_update_position(struct sway_view *view, double ox, double oy) { | 312 | void view_update_position(struct sway_view *view, double ox, double oy) { |