--- linuxsampler/trunk/src/engines/common/VoiceBase.h	2010/09/14 17:09:08	2121
+++ linuxsampler/trunk/src/engines/common/VoiceBase.h	2011/07/11 17:52:01	2205
@@ -185,8 +185,7 @@
                 itTriggerEvent = Pool<Event>::Iterator();
 
                 // If sample stream or release stage finished, kill the voice
-                if (PlaybackState == Voice::playback_state_end ||
-                    pEG1->getSegmentType() == EG::segment_end) {
+                if (PlaybackState == Voice::playback_state_end || EG1Finished()) {
                     KillImmediately();
                 }
             }