From 6fb099a88b40a9337c5f1b5fea0ebb00e85f598f Mon Sep 17 00:00:00 2001 From: Len Ovens Date: Mon, 7 Nov 2016 11:08:00 -0800 Subject: [PATCH] make auto track naming make a bit more sense --- libs/ardour/session.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 51bef1202b..7e96cefbf6 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -2380,8 +2380,11 @@ Session::find_route_name (string const & base, uint32_t& id, string& name, bool } } - if (!definitely_add_number && route_by_name (base) == 0) { - /* juse use the base */ + /* if we have "base 1" already, it doesn't make sense to add "base" + * if "base 1" has been deleted, adding "base" is no worse than "base 1" + */ + if (!definitely_add_number && route_by_name (base) == 0 && (route_by_name (string_compose("%1 1", base)) == 0)) { + /* just use the base */ name = base; return true; }