diff options
| author |  Drew DeVault <sir@cmpwn.com> | 2019-01-28 17:14:41 -0500 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2019-01-28 17:14:41 -0500 |
| commit | 606f6a37076adda6ed20acc16b9325bb3ed27aa5 (patch) | |
| tree | 0db761da7732a357879c5367614d8797585090f0 | |
| parent | Merge pull request #3528 from emersion/cleanup-log-env (diff) | |
| parent | Remove bad assertion in container_handle_fullscreen_reparent (diff) | |
| download | sway-606f6a37076adda6ed20acc16b9325bb3ed27aa5.tar.gz sway-606f6a37076adda6ed20acc16b9325bb3ed27aa5.tar.zst sway-606f6a37076adda6ed20acc16b9325bb3ed27aa5.zip | |
Merge pull request #3530 from RyanDwyer/fix-assertion
Remove bad assertion in container_handle_fullscreen_reparent
| -rw-r--r-- | sway/tree/container.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c index 0415d63c..0ebdc51d 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) { | |||
| 1182 | } | 1182 | } |
| 1183 | 1183 | ||
| 1184 | void container_handle_fullscreen_reparent(struct sway_container *con) { | 1184 | void container_handle_fullscreen_reparent(struct sway_container *con) { |
| 1185 | if (!sway_assert(con->workspace, "Expected con to have a workspace")) { | 1185 | if (con->fullscreen_mode != FULLSCREEN_WORKSPACE || !con->workspace || |
| 1186 | return; | ||
| 1187 | } | ||
| 1188 | if (con->fullscreen_mode != FULLSCREEN_WORKSPACE || | ||
| 1189 | con->workspace->fullscreen == con) { | 1186 | con->workspace->fullscreen == con) { |
| 1190 | return; | 1187 | return; |
| 1191 | } | 1188 | } |