diff --git a/Audio/AudioPlayer.m b/Audio/AudioPlayer.m
index cd52cd5f4..f36aa180b 100644
--- a/Audio/AudioPlayer.m
+++ b/Audio/AudioPlayer.m
@@ -174,14 +174,13 @@
 			[anObject setShouldContinue:NO];
 		}
 		[chainQueue removeAllObjects];
-	
+
 		if (endOfInputReached) {
 			[self endOfInputReached:bufferChain];
-		}
+		} 
 	}
 }
 
-
 - (void)setShouldContinue:(BOOL)s
 {
 	if (bufferChain)
@@ -286,10 +285,10 @@
 - (void)endOfInputPlayed
 {
 	@synchronized(chainQueue) {
+		endOfInputReached = NO;
+		
 		if ([chainQueue count] <= 0)
 		{
-			endOfInputReached = NO;
-			
 			//End of playlist
 			[self stop];