aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--screen.c5
-rw-r--r--tmux.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/screen.c b/screen.c
index 9be8d344..7ca722bb 100644
--- a/screen.c
+++ b/screen.c
@@ -1,4 +1,4 @@
-/* $Id: screen.c,v 1.9 2007-08-28 09:26:07 nicm Exp $ */
+/* $Id: screen.c,v 1.10 2007-09-21 18:00:58 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -100,6 +100,9 @@ screen_resize(struct screen *s, u_int sx, u_int sy)
{
u_int i, ox, oy, ny;
+ if (sx == s->sx || sy == s->sy)
+ return;
+
if (sx < 1)
sx = 1;
if (sy < 1)
diff --git a/tmux.c b/tmux.c
index f6515bab..881e7900 100644
--- a/tmux.c
+++ b/tmux.c
@@ -1,4 +1,4 @@
-/* $Id: tmux.c,v 1.7 2007-09-20 09:43:33 nicm Exp $ */
+/* $Id: tmux.c,v 1.8 2007-09-21 18:00:58 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -190,7 +190,7 @@ restart:
else if (op != OP_LIST) {
if (server_start() != 0)
errx(1, "couldn't start server");
- sleep(1);
+ sleep(1); /* XXX this sucks */
}
} else {
if (!S_ISSOCK(sb.st_mode))