--- linuxsampler/trunk/src/engines/common/VoiceBase.h	2009/11/03 19:27:42	2027
+++ linuxsampler/trunk/src/engines/common/VoiceBase.h	2010/01/30 10:30:02	2055
@@ -3,8 +3,8 @@
  *   LinuxSampler - modular, streaming capable sampler                     *
  *                                                                         *
  *   Copyright (C) 2003,2004 by Benno Senoner and Christian Schoenebeck    *
- *   Copyright (C) 2005-2009 Christian Schoenebeck                         *
- *   Copyright (C) 2009 Grigor Iliev                                       *
+ *   Copyright (C) 2005-2008 Christian Schoenebeck                         *
+ *   Copyright (C) 2009-2010 Christian Schoenebeck and Grigor Iliev        *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -185,10 +185,10 @@
                 itTriggerEvent = Pool<Event>::Iterator();
 
                 // If sample stream or release stage finished, kill the voice
-                if (
-                    PlaybackState == Voice::playback_state_end ||
-                    EG1.getSegmentType() == gig::EGADSR::segment_end
-                ) KillImmediately();
+                if (PlaybackState == Voice::playback_state_end ||
+                    pEG1->getSegmentType() == EG::segment_end) {
+                    KillImmediately();
+                }
             }
 
             /**