From 20e17604b5bb7c89be1182428ed94dfe7e2b1d37 Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Sat, 19 Mar 2011 23:31:08 +0000 Subject: [PATCH] Sync OpenBSD patchset 867: Prevent tiled producing a corrupt layout when only one column is needed, from Karl Ferdinand Ebert. --- layout-set.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/layout-set.c b/layout-set.c index 1a155db8..80cc95ba 100644 --- a/layout-set.c +++ b/layout-set.c @@ -1,4 +1,4 @@ -/* $Id: layout-set.c,v 1.8 2010-12-22 15:23:59 tcunha Exp $ */ +/* $Id: layout-set.c,v 1.9 2011-03-19 23:31:08 tcunha Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott @@ -519,7 +519,7 @@ layout_set_tiled(struct window *w) TAILQ_INSERT_TAIL(&lc->cells, lcrow, entry); /* If only one column, just use the row directly. */ - if (n - (j * columns) == 1) { + if (n - (j * columns) == 1 || columns == 1) { layout_make_leaf(lcrow, wp); wp = TAILQ_NEXT(wp, entry); continue;