Merge pull request #3212 from martinetd/move_floating

move to workspace: fix moving floating container to non-empty workspace
This commit is contained in:
Brian Ashworth 2018-11-28 11:16:14 -05:00 committed by GitHub
commit 5341e034df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -216,6 +216,7 @@ static void container_move_to_container(struct sway_container *container,
return;
}
if (container_is_floating(container)) {
container_move_to_workspace(container, destination->workspace);
return;
}
struct sway_workspace *old_workspace = container->workspace;