smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 15:54:57 +01:00
Code Issues Projects Releases Wiki Activity

fix manual merge error

Browse source
This commit is contained in:
Paul Davis 2016-02-25 23:15:18 -05:00
parent 0e1190c555
commit 3819d4f9ed
1 changed files with 0 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gtk2_ardour/ardour_ui_dependents.cc
View file

@ -121,7 +121,6 @@ ARDOUR_UI::connect_dependents_to_session (ARDOUR::Session *s)
mixer->set_session (s); mixer->set_session (s);
meterbridge->set_session (s); meterbridge->set_session (s);
luawindow->set_session (s); luawindow->set_session (s);
masters->set_session (s);
/* its safe to do this now */ /* its safe to do this now */
@ -265,11 +264,6 @@ ARDOUR_UI::setup_windows ()
return -1; return -1;
} }
if (create_masters()) {
error << _("UI: cannot setup meterbridge") << endmsg;
return -1;
}
/* order of addition affects order seen in initial window display */ /* order of addition affects order seen in initial window display */
rc_option_editor->add_to_notebook (_tabs, _("Preferences")); rc_option_editor->add_to_notebook (_tabs, _("Preferences"));