nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Disallow moving a container to itself since this would crash i3.

This commit is contained in:
Ingo Bürk 2015-04-15 19:59:53 +02:00
parent 05e8caab17
commit 283b231290
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/con.c
View File

@ -914,6 +914,11 @@ bool con_move_to_mark(Con *con, const char *mark) {
target = TAILQ_FIRST(&(target->focus_head)); target = TAILQ_FIRST(&(target->focus_head));
} }
if (con == target) {
DLOG("cannot move the container to itself, aborting.\n");
return false;
}
return _con_move_to_con(con, target, false, true, false); return _con_move_to_con(con, target, false, true, false);
} }

15
testcases/t/243-move-to-mark.t
View File

@ -268,6 +268,21 @@ sync_with_i3;
($nodes, $focus) = get_ws_content($target_ws); ($nodes, $focus) = get_ws_content($target_ws);
is(@{$nodes}, 1, 'tiling container moved to the target workspace'); is(@{$nodes}, 1, 'tiling container moved to the target workspace');
###############################################################################
# Given 'S' and 'M' are the same container, when 'S' is moved to 'M', then
# the command is ignored.
###############################################################################
$ws = fresh_workspace;
$S = open_window;
$M = $S;
cmd 'mark target';
cmd '[id="' . $S->{id} . '"] move container to mark target';
sync_with_i3;
does_i3_live;
############################################################################### ###############################################################################
done_testing; done_testing;