mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-24 17:01:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/swap: error on swapping a container with itself

Browse source 
(cherry picked from commit feea4b4410)
This commit is contained in:
Ronan Pigott 2022-01-22 10:52:03 -07:00 committed by Simon Ser
parent 0adcf77f3f
commit 3a65ad427a
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sway/commands/swap.c
View file

@ -126,10 +126,10 @@ void container_swap(struct sway_container *con1, struct sway_container *con2) {
} }
enum sway_fullscreen_mode fs1 = con1->pending.fullscreen_mode; enum sway_fullscreen_mode fs1 = con1->pending.fullscreen_mode;
enum sway_fullscreen_mode fs2 = con2->pending.fullscreen_mode;
if (fs1) { if (fs1) {
container_fullscreen_disable(con1); container_fullscreen_disable(con1);
} }
enum sway_fullscreen_mode fs2 = con2->pending.fullscreen_mode;
if (fs2) { if (fs2) {
container_fullscreen_disable(con2); container_fullscreen_disable(con2);
} }
@ -247,6 +247,9 @@ struct cmd_results *cmd_swap(int argc, char **argv) {
} else if (!current) { } else if (!current) {
error = cmd_results_new(CMD_FAILURE, error = cmd_results_new(CMD_FAILURE,
"Can only swap with containers and views"); "Can only swap with containers and views");
} else if (current == other) {
error = cmd_results_new(CMD_FAILURE,
"Cannot swap a container with itself");
} else if (container_has_ancestor(current, other) } else if (container_has_ancestor(current, other)
|| container_has_ancestor(other, current)) { || container_has_ancestor(other, current)) {
error = cmd_results_new(CMD_FAILURE, error = cmd_results_new(CMD_FAILURE,