From 6b734d10746ac86a13b05ad48b79e92ca8ccc96b Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Tue, 16 Aug 2011 09:36:23 +0000 Subject: [PATCH] Correctly skip existing numbers when generating the name for a new session. --- session.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/session.c b/session.c index e9bffed2..2545d868 100644 --- a/session.c +++ b/session.c @@ -119,11 +119,18 @@ session_create(const char *name, const char *cmd, const char *cwd, s->sx = sx; s->sy = sy; - s->idx = next_session++; - if (name != NULL) + if (name != NULL) { s->name = xstrdup(name); - else - xasprintf(&s->name, "%u", s->idx); + s->idx = next_session++; + } else { + s->name = NULL; + do { + s->idx = next_session++; + if (s->name != NULL) + xfree (s->name); + xasprintf(&s->name, "%u", s->idx); + } while (RB_FIND(sessions, &sessions, s) != NULL); + } RB_INSERT(sessions, &sessions, s); if (cmd != NULL) { -- 2.11.4.GIT