diff options
| author |  emersion <contact@emersion.fr> | 2018-10-03 21:22:25 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-10-03 21:22:25 +0200 |
| commit | 681ed1826ddb8e05daf0ab30575f4b1f8cd23239 (patch) | |
| tree | 6c22875ff4b80dc5d5e78a2e4c7412ba5cd083a1 | |
| parent | Merge pull request #2709 from BuJo/feature/raise_floating (diff) | |
| parent | Fix crash if view has no container (diff) | |
| download | sway-681ed1826ddb8e05daf0ab30575f4b1f8cd23239.tar.gz sway-681ed1826ddb8e05daf0ab30575f4b1f8cd23239.tar.zst sway-681ed1826ddb8e05daf0ab30575f4b1f8cd23239.zip | |
Merge pull request #2759 from minus7/fix-view-container-null
Fix crash if view has no container
| -rw-r--r-- | sway/tree/view.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/tree/view.c b/sway/tree/view.c index 9c7c44e9..73ce55ac 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c | |||
| @@ -341,7 +341,7 @@ void view_update_csd_from_client(struct sway_view *view, bool enabled) { | |||
| 341 | wlr_log(WLR_DEBUG, "View %p updated CSD to %i", view, enabled); | 341 | wlr_log(WLR_DEBUG, "View %p updated CSD to %i", view, enabled); |
| 342 | if (enabled && view->border != B_CSD) { | 342 | if (enabled && view->border != B_CSD) { |
| 343 | view->saved_border = view->border; | 343 | view->saved_border = view->border; |
| 344 | if (container_is_floating(view->container)) { | 344 | if (view->container && container_is_floating(view->container)) { |
| 345 | view->border = B_CSD; | 345 | view->border = B_CSD; |
| 346 | } | 346 | } |
| 347 | } else if (!enabled && view->border == B_CSD) { | 347 | } else if (!enabled && view->border == B_CSD) { |