smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-28 09:27:39 +01:00
Code Issues Projects Releases Wiki Activity

get_row_by_name should only use the snapshot's label to check against, as the row's name may have "..." appended to it (if it's long enough)

Browse source
This commit is contained in:
Nikolaus Gullotta 2019-08-21 11:04:51 -05:00 • committed by Nikolaus Gullotta
parent 2aac61b509
commit b14b9f352e
No known key found for this signature in database
GPG key ID: 565F60578092AA31
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
gtk2_ardour/mixer_snapshots.cc
View file

@ -195,8 +195,8 @@ void MixerSnapshotList::new_snapshot() {
prompt.set_initial_text (_session->name());
prompt.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
string name;
if (prompt.run() == RESPONSE_ACCEPT) {
string name;
prompt.get_result(name);
if (name.length()) {
@ -458,7 +458,8 @@ void MixerSnapshotList::rename_snapshot(TreeModel::const_iterator& iter)
return;
}
const string name = (*iter)[_columns.name];
MixerSnapshot* snapshot = (*iter)[_columns.snapshot];
const string name = snapshot->get_label();
Prompter prompter (true);
prompter.set_name("RenamePrompter");
@ -467,8 +468,8 @@ void MixerSnapshotList::rename_snapshot(TreeModel::const_iterator& iter)
prompter.set_initial_text(name);
prompter.add_button(Stock::SAVE, RESPONSE_ACCEPT);
string new_name;
if (prompter.run() == RESPONSE_ACCEPT) {
string new_name;
prompter.get_result(new_name);
if (new_name.length()) {
@ -486,7 +487,6 @@ void MixerSnapshotList::rename_snapshot(TreeModel::const_iterator& iter)
}
}
MixerSnapshot* snapshot = (*iter)[_columns.snapshot];
if(_session->snapshot_manager().rename_snapshot(snapshot, new_name)) {
if (new_name.length() > 45) {
new_name = new_name.substr(0, 45);
@ -568,8 +568,8 @@ TreeModel::const_iterator MixerSnapshotList::get_row_by_name(const std::string&
TreeModel::const_iterator iter;
TreeModel::Children rows = _snapshot_model->children();
for(iter = rows.begin(); iter != rows.end(); iter++) {
const string row_name = (*iter)[_columns.name];
if(row_name == name) {
MixerSnapshot* snapshot = (*iter)[_columns.snapshot];
if(snapshot->get_label() == name) {
break;
}
}