From: <sv...@op...> - 2024-03-13 18:07:41
|
Author: sagamusix Date: Wed Mar 13 19:07:24 2024 New Revision: 20320 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20320 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.30/libopenmpt/xmp-openmpt.cpp (contents, props changed) Modified: branches/OpenMPT-1.30/libopenmpt/xmp-openmpt.cpp ============================================================================== --- branches/OpenMPT-1.30/libopenmpt/xmp-openmpt.cpp Wed Mar 13 19:05:06 2024 (r20319) +++ branches/OpenMPT-1.30/libopenmpt/xmp-openmpt.cpp Wed Mar 13 19:07:24 2024 (r20320) @@ -741,9 +741,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++ ) { |