fix manual merge error

diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index 98a8929b808ec89f0f5ce1e215440e55f636fe7d..68e29f57f818163996df01fad3d8d68727020aa1 100644 (file)
--- 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"));