aboutsummaryrefslogtreecommitdiff
path: root/names.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2009-07-02 18:17:46 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2009-07-02 18:17:46 +0000
commit08c724963631f5184014df7334c97b8b646a6a03 (patch)
treeb7c16f95f295fdafb73702ca000d36e4aab490f1 /names.c
parent29ac832cb38f2193866a3fa5b14abc7537852eb4 (diff)
downloadrtmux-08c724963631f5184014df7334c97b8b646a6a03.tar.gz
rtmux-08c724963631f5184014df7334c97b8b646a6a03.tar.bz2
rtmux-08c724963631f5184014df7334c97b8b646a6a03.zip
Change default_window_name to use window_default_command if the actual cmd is
empty. From Josh Elsasser.
Diffstat (limited to 'names.c')
-rw-r--r--names.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/names.c b/names.c
index ed88025b..4df967f5 100644
--- a/names.c
+++ b/names.c
@@ -1,4 +1,4 @@
-/* $Id: names.c,v 1.9 2009-06-25 16:49:02 nicm Exp $ */
+/* $Id: names.c,v 1.10 2009-07-02 18:17:46 nicm Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -78,7 +78,9 @@ default_window_name(struct window *w)
{
if (w->active->screen != &w->active->base)
return (xstrdup("[tmux]"));
- return (parse_window_name(w->active->cmd));
+ if (w->active->cmd != NULL && *w->active->cmd != '\0')
+ return (parse_window_name(w->active->cmd));
+ return (parse_window_name(window_default_command()));
}
char *