Merge pull request #2759 from minus7/fix-view-container-null

Fix crash if view has no container
This commit is contained in:
emersion 2018-10-03 21:22:25 +02:00 committed by GitHub
commit 681ed1826d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -341,7 +341,7 @@ void view_update_csd_from_client(struct sway_view *view, bool enabled) {
wlr_log(WLR_DEBUG, "View %p updated CSD to %i", view, enabled); wlr_log(WLR_DEBUG, "View %p updated CSD to %i", view, enabled);
if (enabled && view->border != B_CSD) { if (enabled && view->border != B_CSD) {
view->saved_border = view->border; view->saved_border = view->border;
if (container_is_floating(view->container)) { if (view->container && container_is_floating(view->container)) {
view->border = B_CSD; view->border = B_CSD;
} }
} else if (!enabled && view->border == B_CSD) { } else if (!enabled && view->border == B_CSD) {