allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

do not call basename_nosuffix() before using matching_unsuffixed_filename_exists_in() because the latter does that call itself.

Browse Source 
As the code used to be, if we are testing for a candidate filename of aaa.bbb.ccc, the call strips .ccc and matching_... strips .bbb
resulting in a match with aaa, which is not intended at all.
This commit is contained in:
Paul Davis
2014-07-10 08:16:27 -04:00
parent 15fa465013
commit 94c8b672c4
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/ardour/session.cc
View File

@@ -3509,7 +3509,6 @@ Session::audio_source_name_is_unique (const string& name, uint32_t chan)
std::vector<string> sdirs = source_search_path (DataType::AUDIO);
vector<space_and_path>::iterator i;
uint32_t existing = 0;
string basename = PBD::basename_nosuffix (name);
for (vector<string>::const_iterator i = sdirs.begin(); i != sdirs.end(); ++i) {
@@ -3521,7 +3520,7 @@ Session::audio_source_name_is_unique (const string& name, uint32_t chan)
const string spath = *i;
if (matching_unsuffixed_filename_exists_in (spath, basename)) {
if (matching_unsuffixed_filename_exists_in (spath, name)) {
existing++;
break;
}
@@ -3543,7 +3542,7 @@ Session::audio_source_name_is_unique (const string& name, uint32_t chan)
break;
}
}
return (existing == 0);
}