Merge pull request #2585 from RyanDwyer/fix-move-across-outputs

Fix crash when moving view across outputs
This commit is contained in:
Drew DeVault 2018-09-05 22:04:38 -04:00 committed by GitHub
commit 2eec9740bd
Failed to generate hash of commit

View file

@ -117,7 +117,8 @@ static void container_move_to_container_from_direction(
struct sway_container *container, struct sway_container *destination,
enum movement_direction move_dir) {
if (destination->view) {
if (destination->parent == container->parent) {
if (destination->parent == container->parent &&
destination->workspace == container->workspace) {
wlr_log(WLR_DEBUG, "Swapping siblings");
list_t *siblings = container_get_siblings(container);
int container_index = list_find(siblings, container);