diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2019-01-29 08:05:55 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2019-01-29 08:05:55 +1000 |
commit | 8995694a2f9bf1f12b326973bf2491f1e4e64a57 (patch) | |
tree | 0db761da7732a357879c5367614d8797585090f0 | |
parent | Merge pull request #3528 from emersion/cleanup-log-env (diff) | |
download | sway-8995694a2f9bf1f12b326973bf2491f1e4e64a57.tar.gz sway-8995694a2f9bf1f12b326973bf2491f1e4e64a57.tar.zst sway-8995694a2f9bf1f12b326973bf2491f1e4e64a57.zip |
Remove bad assertion in container_handle_fullscreen_reparent
The assertion could trigger when called from workspace_wrap_children.
-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 | } |