Merge pull request #3530 from RyanDwyer/fix-assertion

Remove bad assertion in container_handle_fullscreen_reparent
This commit is contained in:
Drew DeVault 2019-01-28 17:14:41 -05:00 committed by GitHub
commit 606f6a3707
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1182,10 +1182,7 @@ list_t *container_get_current_siblings(struct sway_container *container) {
} }
void container_handle_fullscreen_reparent(struct sway_container *con) { void container_handle_fullscreen_reparent(struct sway_container *con) {
if (!sway_assert(con->workspace, "Expected con to have a workspace")) { if (con->fullscreen_mode != FULLSCREEN_WORKSPACE || !con->workspace ||
return;
}
if (con->fullscreen_mode != FULLSCREEN_WORKSPACE ||
con->workspace->fullscreen == con) { con->workspace->fullscreen == con) {
return; return;
} }