From 827a626895402b1c021390d679612099b1b47d85 Mon Sep 17 00:00:00 2001
From: Christopher Eby <kreed@kreed.org>
Date: Fri, 19 Mar 2010 10:27:45 -0500
Subject: [PATCH] Relocate scrobbling code

---
 src/org/kreed/vanilla/PlaybackService.java | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/org/kreed/vanilla/PlaybackService.java b/src/org/kreed/vanilla/PlaybackService.java
index fd0dd44d..08c57e61 100644
--- a/src/org/kreed/vanilla/PlaybackService.java
+++ b/src/org/kreed/vanilla/PlaybackService.java
@@ -429,6 +429,14 @@ public class PlaybackService extends Service implements Runnable, MediaPlayer.On
 			intent.putExtra("song", song);
 			sendBroadcast(intent);
 
+			if (mScrobble) {
+				intent = new Intent("net.jjc1138.android.scrobbler.action.MUSIC_STATUS");
+				intent.putExtra("playing", mState == STATE_PLAYING);
+				if (song != null)
+					intent.putExtra("id", song.id);
+				sendBroadcast(intent);
+			}
+
 			mLastSongBroadcast = song;
 		}
 	}
@@ -452,13 +460,6 @@ public class PlaybackService extends Service implements Runnable, MediaPlayer.On
 			else
 				stopForegroundCompat(cancelNotification);
 		}
-
-		if (mScrobble) {
-			Intent intent = new Intent("net.jjc1138.android.scrobbler.action.MUSIC_STATUS");
-			intent.putExtra("playing", mState == STATE_PLAYING);
-			intent.putExtra("id", song.id);
-			sendBroadcast(intent);
-		}
 	}
 
 	private void retrieveSongs()