[OMPT-svn-commit] OpenMPT r22212 - in branches/OpenMPT-1.31: . soundlib

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

Author: sagamusix
Date: Sun Nov 17 23:26:15 2024
New Revision: 22212
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22212

Log:
Merged revision(s) 22211 from trunk/OpenMPT:
[Fix] STM: Scream Tracker 2 does not sanitize loop ends, so a sample can continue reading into the next sample's data. Fixes lessons in love.stm (https://www.un4seen.com/forum/?topic=15448.msg144130#msg144130).
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/soundlib/Load_stm.cpp

Modified: branches/OpenMPT-1.31/soundlib/Load_stm.cpp
==============================================================================
--- branches/OpenMPT-1.31/soundlib/Load_stm.cpp	Sun Nov 17 23:25:58 2024	(r22211)
+++ branches/OpenMPT-1.31/soundlib/Load_stm.cpp	Sun Nov 17 23:26:15 2024	(r22212)
@@ -49,7 +49,7 @@
 			&& mptSmp.nLoopEnd != 0xFFFF)
 		{
 			mptSmp.uFlags = CHN_LOOP;
-			mptSmp.nLoopEnd = std::min(mptSmp.nLoopEnd, mptSmp.nLength);
+			mptSmp.nLength = std::max(mptSmp.nLoopEnd, mptSmp.nLength);
 		}
 	}
 };