Merge branch 'obsd-master'

2 files changed, 4 insertions, 1 deletions

diff --git a/resize.c b/resize.c
index fef8feeb..2134165f 100644
--- a/resize.c
+++ b/resize.c
@@ -188,7 +188,7 @@ recalculate_sizes(void)
 		type = options_get_number(w->options, "window-size");
 		if (type == WINDOW_SIZE_MANUAL)
 			continue;
-		current = !options_get_number(w->options, "aggressive-resize");
+		current = options_get_number(w->options, "aggressive-resize");
 
 		changed = 1;
 		if (type == WINDOW_SIZE_LARGEST) {
diff --git a/tty.c b/tty.c
index d3db798f..a198b89c 100644
--- a/tty.c
+++ b/tty.c
@@ -807,6 +807,9 @@ tty_update_client_offset(struct client *c)
 {
 	u_int	ox, oy, sx, sy;
 
+	if (~c->flags & CLIENT_TERMINAL)
+		return;
+
 	c->tty.oflag = tty_window_offset1(&c->tty, &ox, &oy, &sx, &sy);
 	if (ox == c->tty.oox &&
 	    oy == c->tty.ooy &&