From 3819d4f9eda7e7dc827f3c97a6e12c0385e4579b Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 25 Feb 2016 23:15:18 -0500 Subject: [PATCH] fix manual merge error --- gtk2_ardour/ardour_ui_dependents.cc | 6 ------ 1 file changed, 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"));