diff --git a/src/commands.c b/src/commands.c index 11d0b244..e1aa063b 100644 --- a/src/commands.c +++ b/src/commands.c @@ -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; } diff --git a/testcases/t/224-regress-resize-branch.t b/testcases/t/224-regress-resize-branch.t new file mode 100644 index 00000000..a4a1b31b --- /dev/null +++ b/testcases/t/224-regress-resize-branch.t @@ -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;