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

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

Revision: 3847
          http://sourceforge.net/p/modplug/code/3847
Author:   saga-games
Date:     2014-03-08 00:19:39 +0000 (Sat, 08 Mar 2014)
Log Message:
-----------
[Fix] Envelopy carry was broken on sample-less channels

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

Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp	2014-03-07 21:26:33 UTC (rev 3846)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp	2014-03-08 00:19:39 UTC (rev 3847)
@@ -893,9 +893,9 @@
 		}
 	}
 
-	// IT Compatibility: Envelope pickup after SCx cut
+	// IT Compatibility: Envelope pickup after SCx cut (but don't do this when working with plugins, or else envelope carry stops working)
 	// Test case: cut-carry.it
-	if(pChn->nInc == 0 && (GetType() & (MOD_TYPE_IT | MOD_TYPE_MPT)))
+	if(pChn->nInc == 0 && (GetType() & (MOD_TYPE_IT | MOD_TYPE_MPT)) && (!pIns || !pIns->HasValidMIDIChannel()))
 	{
 		instrumentChanged = true;
 	}

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