aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2019-01-28 17:14:41 -0500
committerGitHub <noreply@github.com>2019-01-28 17:14:41 -0500
commit606f6a37076adda6ed20acc16b9325bb3ed27aa5 (patch)
tree0db761da7732a357879c5367614d8797585090f0
parent22237e0b423e49e33293943688a7bdb2db41757d (diff)
parent8995694a2f9bf1f12b326973bf2491f1e4e64a57 (diff)
downloadsway-606f6a37076adda6ed20acc16b9325bb3ed27aa5.zip
sway-606f6a37076adda6ed20acc16b9325bb3ed27aa5.tar.gz
sway-606f6a37076adda6ed20acc16b9325bb3ed27aa5.tar.bz2
Merge pull request #3530 from RyanDwyer/fix-assertion
Remove bad assertion in container_handle_fullscreen_reparent
-rw-r--r--sway/tree/container.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c
index 0415d63..0ebdc51 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -1182,10 +1182,7 @@ list_t *container_get_current_siblings(struct sway_container *container) {
}
void container_handle_fullscreen_reparent(struct sway_container *con) {
- if (!sway_assert(con->workspace, "Expected con to have a workspace")) {
- return;
- }
- if (con->fullscreen_mode != FULLSCREEN_WORKSPACE ||
+ if (con->fullscreen_mode != FULLSCREEN_WORKSPACE || !con->workspace ||
con->workspace->fullscreen == con) {
return;
}