diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-02-25 23:15:18 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-31 15:30:38 -0400 |
| commit | 3819d4f9eda7e7dc827f3c97a6e12c0385e4579b (patch) | |
| tree | 49b583d55bb93f43d3febe4e1c357832b5e554e1 /gtk2_ardour/ardour_ui_dependents.cc | |
| parent | 0e1190c5551101c51a6fc7536dc9d2f38bdcae86 (diff) | |
fix manual merge error
Diffstat (limited to 'gtk2_ardour/ardour_ui_dependents.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui_dependents.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc index 98a8929b80..68e29f57f8 100644 --- a/gtk2_ardour/ardour_ui_dependents.cc +++ b/gtk2_ardour/ardour_ui_dependents.cc @@ -121,7 +121,6 @@ ARDOUR_UI::connect_dependents_to_session (ARDOUR::Session *s) mixer->set_session (s); meterbridge->set_session (s); luawindow->set_session (s); - masters->set_session (s); /* its safe to do this now */ @@ -265,11 +264,6 @@ ARDOUR_UI::setup_windows () return -1; } - if (create_masters()) { - error << _("UI: cannot setup meterbridge") << endmsg; - return -1; - } - /* order of addition affects order seen in initial window display */ rc_option_editor->add_to_notebook (_tabs, _("Preferences")); |