--- linuxsampler/trunk/src/engines/gig/Voice.cpp	2005/10/28 19:51:26	795
+++ linuxsampler/trunk/src/engines/gig/Voice.cpp	2005/10/30 08:35:13	796
@@ -750,6 +750,9 @@
             while (itNoteEvent && itNoteEvent->FragmentPos() <= Skip) ++itNoteEvent;
         }
 
+        uint killPos;
+        if (itKillEvent) killPos = RTMath::Min(itKillEvent->FragmentPos(), pEngine->MaxFadeOutPos);
+
         uint i = Skip;
         while (i < Samples) {
             int iSubFragmentEnd = RTMath::Min(i + CONFIG_DEFAULT_SUBFRAGMENT_SIZE, Samples);
@@ -770,6 +773,12 @@
             // process transition events (note on, note off & sustain pedal)
             processTransitionEvents(itNoteEvent, iSubFragmentEnd);
 
+            // if the voice was killed in this subfragment switch EG1 to fade out stage
+            if (itKillEvent && killPos <= iSubFragmentEnd) {
+                EG1.enterFadeOutStage();
+                itKillEvent = Pool<Event>::Iterator();
+            }
+
             // process envelope generators
             switch (EG1.getSegmentType()) {
                 case EGADSR::segment_lin: