--- src/lib/Hydrogen.cpp~ 2006-01-06 06:15:50.000000000 -0800
+++ src/lib/Hydrogen.cpp 2006-07-22 16:41:44.000000000 -0700
@@ -2491,9 +2491,8 @@
Sample *pSample = Sample::load( sSampleFilename );
// pSample->setFilename( pNewSample->getFilename() ); // riuso il path del nuovo sample (perche' e' gia relativo al path del drumkit)
if (pSample == NULL) {
- errorLog( "[loadDrumkit] Error Loading drumkit: NULL sample, now using /emptySample.wav" );
- pSample->m_sFilename = string(DataPath::getDataPath() ).append( "/emptySample.wav" );
- pSample = Sample::load( pSample->m_sFilename );
+ errorLog( "[loadDrumkit] Error Loading drumkit: " + sSampleFilename + " sample, now using /emptySample.wav" );
+ pSample = Sample::load( string(DataPath::getDataPath() ).append( "/emptySample.wav" ));
}
InstrumentLayer *pLayer = new InstrumentLayer( pSample );
pLayer->m_fStartVelocity = pNewLayer->m_fStartVelocity;