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 | |
parent | Merge pull request #2583 from RyanDwyer/fix-null-surface-crash (diff) | |
parent | Fix crash when moving view across outputs (diff) | |
download | sway-2eec9740bd7f88872e9142f522d51a8585c42456.tar.gz sway-2eec9740bd7f88872e9142f522d51a8585c42456.tar.zst sway-2eec9740bd7f88872e9142f522d51a8585c42456.zip |
Merge pull request #2585 from RyanDwyer/fix-move-across-outputs
Fix crash when moving view across outputs
-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( | |||
117 | struct sway_container *container, struct sway_container *destination, | 117 | struct sway_container *container, struct sway_container *destination, |
118 | enum movement_direction move_dir) { | 118 | enum movement_direction move_dir) { |
119 | if (destination->view) { | 119 | if (destination->view) { |
120 | if (destination->parent == container->parent) { | 120 | if (destination->parent == container->parent && |
121 | destination->workspace == container->workspace) { | ||
121 | wlr_log(WLR_DEBUG, "Swapping siblings"); | 122 | wlr_log(WLR_DEBUG, "Swapping siblings"); |
122 | list_t *siblings = container_get_siblings(container); | 123 | list_t *siblings = container_get_siblings(container); |
123 | int container_index = list_find(siblings, container); | 124 | int container_index = list_find(siblings, container); |