From 07be408f5d5f2ac2236fe304cd79f249290a80b5 Mon Sep 17 00:00:00 2001 From: Johannes Schultz Date: Wed, 13 Mar 2024 18:05:06 +0000 Subject: [PATCH] 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. ........ git-svn-id: https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.31@20319 56274372-70c3-4bfc-bfc3-4c3a0b034d27 --- libopenmpt/xmp-openmpt/xmp-openmpt.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/libopenmpt/xmp-openmpt/xmp-openmpt.cpp b/libopenmpt/xmp-openmpt/xmp-openmpt.cpp index fcf776c31b6..b121cd2d70c 100644 --- a/libopenmpt/xmp-openmpt/xmp-openmpt.cpp +++ b/libopenmpt/xmp-openmpt/xmp-openmpt.cpp @@ -707,9 +707,6 @@ static char * build_xmplay_tags( const openmpt::module & mod, int32_t subsong = if ( subsong >= 0 && static_cast( 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++ ) {