ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

make remove work for transport masters (bug fix, really)

This commit is contained in:
Paul Davis 2018-10-05 14:29:15 -04:00
parent e2be5b7b02
commit e4a914e26e
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtk2_ardour/transport_masters_dialog.cc
View File

@ -83,6 +83,8 @@ TransportMastersWidget::TransportMastersWidget ()
table.set_spacings (6);
TransportMasterManager::instance().CurrentChanged.connect (current_connection, invalidator (*this), boost::bind (&TransportMastersWidget::current_changed, this, _1, _2), gui_context());
TransportMasterManager::instance().Added.connect (current_connection, invalidator (*this), boost::bind (&TransportMastersWidget::rebuild, this), gui_context());
TransportMasterManager::instance().Removed.connect (current_connection, invalidator (*this), boost::bind (&TransportMastersWidget::rebuild, this), gui_context());
rebuild ();
}
@ -114,9 +116,7 @@ TransportMastersWidget::current_changed (boost::shared_ptr<TransportMaster> old_
void
TransportMastersWidget::add_master ()
{
if (!TransportMasterManager::instance().add (LTC, "new ltc")) {
rebuild ();
}
TransportMasterManager::instance().add (LTC, "new ltc");
}
void
@ -247,6 +247,7 @@ TransportMastersWidget::Row::name_press (GdkEventButton* ev)
void
TransportMastersWidget::Row::remove_clicked ()
{
TransportMasterManager::instance().remove (tm->name());
}
void

2
libs/ardour/transport_master_manager.cc
View File

@ -359,7 +359,7 @@ TransportMasterManager::remove (std::string const & name)
for (TransportMasters::iterator t = _transport_masters.begin(); t != _transport_masters.end(); ++t) {
if ((*t)->name() == name) {
if (!tm->removeable()) {
if (!(*t)->removeable()) {
return -1;
}
tm = *t;