ardour/livetrax
13
0
Fork 0
Code

make sure routes instrument info initializes correctly

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@13254 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Hans Baier 2012-10-12 09:25:20 +00:00
parent 6009ad3060
commit e3fb47d990
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/ardour/route.cc
View File

@ -1594,7 +1594,9 @@ void
Route::reset_instrument_info ()
{
boost::shared_ptr<Processor> instr = the_instrument();
_instrument_info.set_internal_instrument (instr);
if (instr) {
_instrument_info.set_internal_instrument (instr);
}
}
/** Caller must hold process lock */
@ -2025,7 +2027,6 @@ Route::set_state (const XMLNode& node, int version)
processor_state.add_child_copy (*child);
}
if (child->name() == X_("Pannable")) {
if (_pannable) {
_pannable->set_state (*child, version);
@ -2045,6 +2046,9 @@ Route::set_state (const XMLNode& node, int version)
set_processor_state (processor_state);
// this looks up the internal instrument in processors
reset_instrument_info();
if ((prop = node.property ("self-solo")) != 0) {
set_self_solo (string_is_affirmative (prop->value()));
}