[OMPT-svn-commit] SF.net SVN: modplug:[5075] trunk/OpenMPT/soundlib/Snd_fx.cpp

[<sag...@us...>]

Revision: 5075
          http://sourceforge.net/p/modplug/code/5075
Author:   saga-games
Date:     2015-05-10 22:35:40 +0000 (Sun, 10 May 2015)
Log Message:
-----------
[Fix] Time estimation: Pattern loops were only calculated correctly when placed on the last channel.

Modified Paths:
--------------
    trunk/OpenMPT/soundlib/Snd_fx.cpp

Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp	2015-05-10 22:28:47 UTC (rev 5074)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp	2015-05-10 22:35:40 UTC (rev 5075)
@@ -916,7 +916,8 @@
 			// This is really just a simple estimation for nested pattern loops. It should handle cases correctly where all parallel loops start and end on the same row.
 			// If one of them starts or ends "in between", it will most likely calculate a wrong duration.
 			// For S3M files, it's also way off.
-			for(CHANNELINDEX nChn = 0; nChn < GetNumChannels(); nChn++)
+			pChn = memory.state.Chn;
+			for(CHANNELINDEX nChn = 0; nChn < GetNumChannels(); nChn++, pChn++)
 			{
 				ModCommand::COMMAND command = pChn->rowCommand.command;
 				ModCommand::PARAM param = pChn->rowCommand.param;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.