[OMPT-svn-commit] OpenMPT r20319 - in branches/OpenMPT-1.31: . libopenmpt/xmp-openmpt

[<sv...@op...>]

Author: sagamusix
Date: Wed Mar 13 19:05:06 2024
New Revision: 20319
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20319

Log:
Merged revision(s) 20318 from trunk/OpenMPT:
[Fix] r20253 was incomplete, now XMPlay received some garbage subtune information because only one subtune info was populated.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/libopenmpt/xmp-openmpt/xmp-openmpt.cpp

Modified: branches/OpenMPT-1.31/libopenmpt/xmp-openmpt/xmp-openmpt.cpp
==============================================================================
--- branches/OpenMPT-1.31/libopenmpt/xmp-openmpt/xmp-openmpt.cpp	Wed Mar 13 19:04:43 2024	(r20318)
+++ branches/OpenMPT-1.31/libopenmpt/xmp-openmpt/xmp-openmpt.cpp	Wed Mar 13 19:05:06 2024	(r20319)
@@ -707,9 +707,6 @@
 	if ( subsong >= 0 && static_cast<size_t>( subsong ) < subsong_names.size() ) {
 		first_subsong += subsong;
 		last_subsong = first_subsong + 1;
-	} else
-	{
-		last_subsong = first_subsong + 1;
 	}
 
 	for ( auto subsong_name = first_subsong; subsong_name != last_subsong; subsong_name++ ) {