Merge branch 'stable-0.4' into stable-0.4-new-fx-mixer

2014-01-16 23:08:04 +01:00
parent ee9160c024 2d4e769bd8
commit abc3c8080f
2 changed files with 2 additions and 1 deletions
--- a/src/tracks/InstrumentTrack.cpp
+++ b/src/tracks/InstrumentTrack.cpp
@@ -894,6 +894,7 @@ Instrument * InstrumentTrack::loadInstrument( const QString & _plugin_name )
 	m_instrument = Instrument::instantiate( _plugin_name, this );
 	engine::mixer()->unlock();

+	setName( m_instrument->displayName() );
 	emit instrumentChanged();

 	return m_instrument;