GrainBuf: fix error handling

Signed-off-by: Tim Blechmann <tim@klingt.org> git-svn-id: https://supercollider.svn.sourceforge.net/svnroot/supercollider/trunk@9910 a380766d-ff14-0410-b294-a243070f3f08
supercollider · Mar 1, 2010 · a4fe3bc · a4fe3bc
1 parent b9f1c37
commit a4fe3bc
Showing 1 changed file with 2 additions and 9 deletions.
diff --git a/common/Source/plugins/GrainUGens.cpp b/common/Source/plugins/GrainUGens.cpp
@@ -1090,8 +1090,8 @@ inline void GrainBuf_next_play_active(GrainBuf *unit, int inNumSamples)
 
 		if (!bufData) {
 			grain->counter -= inNumSamples;
-			GrainBuf_grain_cleanup(unit, grain);
+			if (!GrainBuf_grain_cleanup(unit, grain))
-			++i;
+                ++i;
 			continue;
 		}
 
@@ -1114,13 +1114,6 @@ inline void GrainBuf_next_play_active(GrainBuf *unit, int inNumSamples)
 		else
 			GRAIN_BUF_PLAY_GRAIN(CUSTOM);
 
-
-		if (grain->counter <= 0) {
-			*grain = unit->mGrains[--unit->mNumActive]; // remove grain
-			continue;
-		}
-		++i;
-
 		if (GrainBuf_grain_cleanup(unit, grain))
 			continue;
 		++i;