Fix crashes and hangs on importing some Hydrogen drum kit songs (#5420)

LMMS · Mar 23, 2020 · 2367a62 · 2367a62
1 parent d382d4e
commit 2367a62
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/plugins/HydrogenImport/HydrogenImport.cpp b/plugins/HydrogenImport/HydrogenImport.cpp
@@ -200,13 +200,19 @@ bool HydrogenImport::readSong()
 			else 
 			{
 				unsigned nLayer = 0;
-				QDomNode layerNode = instrumentNode.firstChildElement( "layer" );
+				QDomNode instrumentComponentNode = instrumentNode.firstChildElement("instrumentComponent");
+				if (instrumentComponentNode.isNull())
+				{
+					instrumentComponentNode = instrumentNode;
+				}
+
+				QDomNode layerNode = instrumentComponentNode.firstChildElement( "layer" );
 				while (  ! layerNode.isNull()  ) 
 				{
 					if ( nLayer >= MAX_LAYERS ) 
 					{
-						printf( "nLayer >= MAX_LAYERS" );
-						continue;
+						printf("nLayer >= MAX_LAYERS\n");
+						break;
 					}
 					QString sFilename = LocalFileMng::readXmlString( layerNode, "filename", "" );
 					QString sMode = LocalFileMng::readXmlString( layerNode, "smode", "forward" );