diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-06 16:12:15 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-06 16:12:15 -0400 |
| commit | 30968b854257cb5f9159ca59589f783c85615601 (patch) | |
| tree | 81b105c877dd91745b5e06835cc063ad5d6d0a51 /gtk2_ardour/editor.cc | |
| parent | 44564654fd825f198946d0f189421f9e569f68a6 (diff) | |
| parent | cd6cbba29934bb8045640250e09325a5554d5cfe (diff) | |
merge with master, including manual merge conflict resolution
Diffstat (limited to 'gtk2_ardour/editor.cc')
| -rw-r--r-- | gtk2_ardour/editor.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 194c344241..7f49c56d7b 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -4871,7 +4871,7 @@ Editor::add_routes (RouteList& routes) for (RouteList::iterator x = routes.begin(); x != routes.end(); ++x) { boost::shared_ptr<Route> route = (*x); - if (route->is_hidden() || route->is_monitor()) { + if (route->is_auditioner() || route->is_monitor()) { continue; } |