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

Bugfix: resize window check should check for null 

When checking the window type for a resize command, first check to see
if the window property is null before checking whether or not it is a
dock window. The window may be null in the case it is a branch
container.

fixes #1220
This commit is contained in:
Tony Crisci 2014-04-18 14:14:22 -04:00 committed by Michael Stapelberg
parent 2cc51841a5
commit ea551e4d99
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/commands.c
View File

@ -782,7 +782,7 @@ void cmd_resize(I3_CMD, char *way, char *direction, char *resize_px, char *resiz
owindow *current;
TAILQ_FOREACH(current, &owindows, owindows) {
/* Don't handle dock windows (issue #1201) */
if (current->con->window->dock) {
if (current->con->window && current->con->window->dock) {
DLOG("This is a dock window. Not resizing (con = %p)\n)", current->con);
continue;
}

33
testcases/t/224-regress-resize-branch.t Normal file
View File

@ -0,0 +1,33 @@
#!perl
# vim:ts=4:sw=4:expandtab
#
# Please read the following documents before working on tests:
# • http://build.i3wm.org/docs/testsuite.html
# (or docs/testsuite)
#
# • http://build.i3wm.org/docs/lib-i3test.html
# (alternatively: perldoc ./testcases/lib/i3test.pm)
#
# • http://build.i3wm.org/docs/ipc.html
# (or docs/ipc)
#
# • http://onyxneon.com/books/modern_perl/modern_perl_a4.pdf
# (unless you are already familiar with Perl)
#
# Test that i3 does not crash when resizing a split container
# Ticket: #1220
# Bug still in: 4.7.2-128-g702906d
use i3test;
open_window;
open_window;
cmd 'split h';
open_window;
cmd 'focus parent, resize grow left';
does_i3_live;
done_testing;