diff options
| -rw-r--r-- | cmd-command-prompt.c | 4 | ||||
| -rw-r--r-- | layout-set.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/cmd-command-prompt.c b/cmd-command-prompt.c index d59c51f7..f50408b6 100644 --- a/cmd-command-prompt.c +++ b/cmd-command-prompt.c @@ -1,4 +1,4 @@ -/* $Id: cmd-command-prompt.c,v 1.19 2009-07-17 09:26:21 nicm Exp $ */ +/* $Id: cmd-command-prompt.c,v 1.20 2009-07-20 15:51:32 tcunha Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> @@ -140,6 +140,8 @@ cmd_command_prompt_callback(void *data, const char *s) } } + if (buf == NULL) + return (0); buf[len] = '\0'; s = buf; } diff --git a/layout-set.c b/layout-set.c index 46d2e1ef..0c04577e 100644 --- a/layout-set.c +++ b/layout-set.c @@ -1,4 +1,4 @@ -/* $Id: layout-set.c,v 1.1 2009-07-20 15:42:05 tcunha Exp $ */ +/* $Id: layout-set.c,v 1.2 2009-07-20 15:51:32 tcunha Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> @@ -122,10 +122,9 @@ layout_set_even_h(struct window *w) return; /* How many can we fit? */ - if (w->sx / n < PANE_MINIMUM + 1) { + if (w->sx / n < PANE_MINIMUM + 1) width = PANE_MINIMUM + 1; - n = UINT_MAX; - } else + else width = w->sx / n; /* Free the old root and construct a new. */ @@ -177,10 +176,9 @@ layout_set_even_v(struct window *w) return; /* How many can we fit? */ - if (w->sy / n < PANE_MINIMUM + 1) { + if (w->sy / n < PANE_MINIMUM + 1) height = PANE_MINIMUM + 1; - n = UINT_MAX; - } else + else height = w->sy / n; /* Free the old root and construct a new. */ |