summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2009-11-10 18:04:34 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2009-11-10 18:04:34 +0000
commit23d5e052f303e21a7eb57de8fa29b4e680e6c854 (patch)
treea8f8f2e65384cdc1e5f991fb67472745e7728994 /libs
parentccdd99afcec1118c3a3080e6d109ebae55665336 (diff)
prevent routes from being renamed to match some other send/insert name, as well as the existing test for other route names
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@6053 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
-rw-r--r--libs/ardour/route.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index 4e19b9c23e..54bb140c98 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -203,16 +203,14 @@ string
Route::ensure_track_or_route_name(string name, Session &session)
{
string newname = name;
-
- while (session.route_by_name (newname)!=NULL)
- {
+
+ while (!session.io_name_is_legal (newname)) {
newname = bump_name_once (newname);
}
return newname;
}
-
void
Route::inc_gain (gain_t fraction, void *src)
{