diff options
| author |  Drew DeVault <sir@cmpwn.com> | 2018-09-05 21:59:13 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-09-05 21:59:13 -0400 |
| commit | 7b79ab25776d444a2dd837fab2b15616ebbf0828 (patch) | |
| tree | 7c045f58ab68653728faadf254545ecfb5304d2d | |
| parent | Merge pull request #2582 from ascent12/func (diff) | |
| parent | Fix crash when views rapidly map and unmap (diff) | |
| download | sway-7b79ab25776d444a2dd837fab2b15616ebbf0828.tar.gz sway-7b79ab25776d444a2dd837fab2b15616ebbf0828.tar.zst sway-7b79ab25776d444a2dd837fab2b15616ebbf0828.zip | |
Merge pull request #2583 from RyanDwyer/fix-null-surface-crash
Fix crash when views rapidly map and unmap
| -rw-r--r-- | sway/desktop/render.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/desktop/render.c b/sway/desktop/render.c index 9d80f3c7..bb3902ec 100644 --- a/sway/desktop/render.c +++ b/sway/desktop/render.c | |||
| @@ -266,7 +266,7 @@ static void render_view(struct sway_output *output, pixman_region32_t *damage, | |||
| 266 | struct sway_view *view = con->view; | 266 | struct sway_view *view = con->view; |
| 267 | if (view->saved_buffer) { | 267 | if (view->saved_buffer) { |
| 268 | render_saved_view(view, output, damage, view->container->alpha); | 268 | render_saved_view(view, output, damage, view->container->alpha); |
| 269 | } else { | 269 | } else if (view->surface) { |
| 270 | render_view_toplevels(view, output, damage, view->container->alpha); | 270 | render_view_toplevels(view, output, damage, view->container->alpha); |
| 271 | } | 271 | } |
| 272 | 272 | ||