From 87fa84df131bd30251a789360e73b6fe8162d71f Mon Sep 17 00:00:00 2001
From: Geoff Greer <geoff@greer.fm>
Date: Thu, 10 May 2018 23:44:35 -0700
Subject: [PATCH] cmd_move_container: Focus a window on the source workspace.

In Sway 0.15, moving a window to another workspace would cause a window on the source workspace to be focused. This restores that behavior, allowing you to quickly move a lot of windows to another workspace.
---
 sway/commands/move.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/sway/commands/move.c b/sway/commands/move.c
index a5273ba4..890b1a8c 100644
--- a/sway/commands/move.c
+++ b/sway/commands/move.c
@@ -90,12 +90,14 @@ static struct cmd_results *cmd_move_container(struct sway_container *current,
 		}
 		free(ws_name);
 		struct sway_container *old_parent = current->parent;
-		struct sway_container *focus = seat_get_focus_inactive(
+		struct sway_container *destination = seat_get_focus_inactive(
 				config->handler_context.seat, ws);
-		container_move_to(current, focus);
-		seat_set_focus(config->handler_context.seat, old_parent);
+		container_move_to(current, destination);
+		struct sway_container *focus = seat_get_focus_inactive(
+				config->handler_context.seat, old_parent);
+		seat_set_focus(config->handler_context.seat, focus);
 		container_reap_empty(old_parent);
-		container_reap_empty(focus->parent);
+		container_reap_empty(destination->parent);
 		return cmd_results_new(CMD_SUCCESS, NULL, NULL);
 	} else if (strcasecmp(argv[1], "to") == 0
 			&& strcasecmp(argv[2], "output") == 0) {