[OMPT-svn-commit] SF.net SVN: modplug:[727] trunk/OpenMPT/mptrack/Modedit.cpp

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

Revision: 727
          http://modplug.svn.sourceforge.net/modplug/?rev=727&view=rev
Author:   saga-games
Date:     2010-09-29 23:28:20 +0000 (Wed, 29 Sep 2010)

Log Message:
-----------
[Mod] Instrument editor: Copying / pasting envelopes with no points isn't possible anymore (who wants to do that anyway?).

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Modedit.cpp

Modified: trunk/OpenMPT/mptrack/Modedit.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Modedit.cpp	2010-09-28 20:07:44 UTC (rev 726)
+++ trunk/OpenMPT/mptrack/Modedit.cpp	2010-09-29 23:28:20 UTC (rev 727)
@@ -1109,6 +1109,12 @@
 		break;
 	}
 
+	// We don't want to copy empty envelopes
+	if(pEnv->nNodes == 0)
+	{
+		return false;
+	}
+
 	strcpy(s, pszEnvHdr);
 	wsprintf(s + strlen(s), pszEnvFmt, pEnv->nNodes, pEnv->nSustainStart, pEnv->nSustainEnd, pEnv->nLoopStart, pEnv->nLoopEnd, (pEnv->dwFlags & ENV_SUSTAIN) ? 1 : 0, (pEnv->dwFlags & ENV_LOOP) ? 1 : 0, (pEnv->dwFlags & ENV_CARRY) ? 1 : 0);
 	for (UINT i = 0; i < pEnv->nNodes; i++)
@@ -1186,7 +1192,7 @@
 			pEnv->nLoopStart = loopBegin;
 			pEnv->nLoopEnd = loopEnd;
 			pEnv->nReleaseNode = releaseNode;
-			pEnv->dwFlags = (pEnv->dwFlags & ~(ENV_LOOP|ENV_SUSTAIN|ENV_CARRY)) | (bLoop ? ENV_LOOP : 0) | (bSus ? ENV_SUSTAIN : 0) | (bCarry ? ENV_CARRY: 0) | ENV_ENABLED;
+			pEnv->dwFlags = (pEnv->dwFlags & ~(ENV_LOOP|ENV_SUSTAIN|ENV_CARRY)) | (bLoop ? ENV_LOOP : 0) | (bSus ? ENV_SUSTAIN : 0) | (bCarry ? ENV_CARRY: 0) | (nPoints > 0 ? ENV_ENABLED : 0);
 
 			int oldn = 0;
 			for (UINT i=0; i<nPoints; i++)


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