summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2014-11-12 16:00:03 +0000
committernicm <nicm@openbsd.org>2014-11-12 16:00:03 +0000
commit9219bdc2d92c4b8691ae4d94a124f19db7f6e7f4 (patch)
treebba62b58dfd6bcb4916728bae4b1fef2ac5aa03d
parenttruncate dead.letter (diff)
downloadwireguard-openbsd-9219bdc2d92c4b8691ae4d94a124f19db7f6e7f4.tar.xz
wireguard-openbsd-9219bdc2d92c4b8691ae4d94a124f19db7f6e7f4.zip
Don't let force-width or force-height be < PANE_MINIMUM.
-rw-r--r--usr.bin/tmux/resize.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/tmux/resize.c b/usr.bin/tmux/resize.c
index 0f7fa24364b..661b316f841 100644
--- a/usr.bin/tmux/resize.c
+++ b/usr.bin/tmux/resize.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: resize.c,v 1.12 2014/03/31 21:37:55 nicm Exp $ */
+/* $OpenBSD: resize.c,v 1.13 2014/11/12 16:00:03 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -117,10 +117,10 @@ recalculate_sizes(void)
continue;
limit = options_get_number(&w->options, "force-width");
- if (limit != 0 && ssx > limit)
+ if (limit >= PANE_MINIMUM && ssx > limit)
ssx = limit;
limit = options_get_number(&w->options, "force-height");
- if (limit != 0 && ssy > limit)
+ if (limit >= PANE_MINIMUM && ssy > limit)
ssy = limit;
if (w->sx == ssx && w->sy == ssy)