1 files changed, 8 insertions, 11 deletions
diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c
index 7e43fb5cf..0c37b8d1f 100644
--- a/src/xine-engine/audio_out.c
+++ b/src/xine-engine/audio_out.c
@@ -358,22 +358,19 @@ static audio_buffer_t *fifo_remove_int (audio_fifo_t *fifo, int blocking) {
 
   buf = fifo->first;
 
-  if (buf) {
-    fifo->first = buf->next;
-
-    if (!fifo->first) {
+  fifo->first = buf->next;
 
-      fifo->last = NULL;
-      fifo->num_buffers = 0;
-      pthread_cond_signal (&fifo->empty);
+  if (!fifo->first) {
 
-    } else 
-      fifo->num_buffers--;
+    fifo->last = NULL;
+    fifo->num_buffers = 0;
+    pthread_cond_signal (&fifo->empty);
 
-  }
+  } else
+    fifo->num_buffers--;
 
   buf->next = NULL;
-    
+
   return buf;
 }