diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-09-05 22:04:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-05 22:04:38 -0400 |
| commit | 2eec9740bd7f88872e9142f522d51a8585c42456 (patch) | |
| tree | e1712e28a56b7f2fb9deee4f76d5406e9bb46d3f /sway | |
| parent | 7b79ab25776d444a2dd837fab2b15616ebbf0828 (diff) | |
| parent | 01117db6d9c50572646f9c49e50e02473129c7d4 (diff) | |
Merge pull request #2585 from RyanDwyer/fix-move-across-outputs
Fix crash when moving view across outputs
Diffstat (limited to 'sway')
| -rw-r--r-- | sway/commands/move.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sway/commands/move.c b/sway/commands/move.c index 7b503624..59f1cf78 100644 --- a/sway/commands/move.c +++ b/sway/commands/move.c @@ -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); |