From: <sv...@op...> - 2024-08-12 22:02:04
|
Author: sagamusix Date: Tue Aug 13 00:01:57 2024 New Revision: 21417 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21417 Log: Merged revision(s) 21416 from trunk/OpenMPT: [Fix] Mod Conversion: Condition in r21301 for when to enable sustain loop was wrong (https://bugs.openmpt.org/view.php?id=1805). ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/soundlib/ModInstrument.cpp Modified: branches/OpenMPT-1.31/soundlib/ModInstrument.cpp ============================================================================== --- branches/OpenMPT-1.31/soundlib/ModInstrument.cpp Tue Aug 13 00:01:40 2024 (r21416) +++ branches/OpenMPT-1.31/soundlib/ModInstrument.cpp Tue Aug 13 00:01:57 2024 (r21417) @@ -41,7 +41,7 @@ // So we have to disable the sustain loop if it was behind the normal loop. dwFlags.reset(ENV_SUSTAIN); } - if(!dwFlags.test_all(ENV_LOOP | ENV_SUSTAIN)) + if(!dwFlags[ENV_LOOP | ENV_SUSTAIN]) { // XM has no automatic fade-out behaviour at the end of the envelope. dwFlags.set(ENV_SUSTAIN); |