sway

commit 2eec9740bd7f88872e9142f522d51a8585c42456
parent 7b79ab25776d444a2dd837fab2b15616ebbf0828
Author: Drew DeVault <sir@cmpwn.com>
Date:   Wed,  5 Sep 2018 22:04:38 -0400

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

Fix crash when moving view across outputs
Diffstat:
M
sway/commands/move.c
 | 
3
++-

1 file changed, 2 insertions(+), 1 deletion(-)
diff --git 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);