From 95b94f592191f5f7618baff0fc7e511182f6672a Mon Sep 17 00:00:00 2001
From: Christopher Eby <kreed@kreed.org>
Date: Sun, 4 Apr 2010 10:16:45 -0500
Subject: [PATCH] Set the no media flag in setCurrentSong rather than in
 getSong

Avoids an infinite loop on startup with no media
---
 src/org/kreed/vanilla/PlaybackService.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/org/kreed/vanilla/PlaybackService.java b/src/org/kreed/vanilla/PlaybackService.java
index 8b740412..e0fdc055 100644
--- a/src/org/kreed/vanilla/PlaybackService.java
+++ b/src/org/kreed/vanilla/PlaybackService.java
@@ -532,8 +532,10 @@ public class PlaybackService extends Service implements Runnable, MediaPlayer.On
 			return;
 
 		Song song = getSong(delta);
-		if (song == null)
+		if (song == null) {
+			setFlag(FLAG_NO_MEDIA);
 			return;
+		}
 
 		synchronized (mSongTimeline) {
 			mCurrentSong += delta;
@@ -599,10 +601,8 @@ public class PlaybackService extends Service implements Runnable, MediaPlayer.On
 
 		if (!song.populate()) {
 			song.randomize();
-			if (!song.populate()) {
-				setFlag(FLAG_NO_MEDIA);
+			if (!song.populate())
 				return null;
-			}
 		}
 
 		return song;