From d814daed312e952ac468baae3f910c5d5922324b Mon Sep 17 00:00:00 2001
From: Kieran Clancy <clancy.kieran@gmail.com>
Date: Fri, 16 Nov 2012 14:25:30 +1030
Subject: [PATCH] Ensure callback is not null in SongTimeline

---
 src/ch/blinkenlights/android/vanilla/SongTimeline.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/ch/blinkenlights/android/vanilla/SongTimeline.java b/src/ch/blinkenlights/android/vanilla/SongTimeline.java
index 16aac5be..bf34cd9c 100644
--- a/src/ch/blinkenlights/android/vanilla/SongTimeline.java
+++ b/src/ch/blinkenlights/android/vanilla/SongTimeline.java
@@ -733,8 +733,10 @@ public final class SongTimeline {
 				mSongs.subList(mCurrentPos + 1, mSongs.size()).clear();
 		}
 
-		mCallback.activeSongReplaced(+1, getSong(+1));
-		mCallback.positionInfoChanged();
+		if (mCallback != null) {
+			mCallback.activeSongReplaced(+1, getSong(+1));
+			mCallback.positionInfoChanged();
+		}
 
 		changed();
 	}
@@ -761,6 +763,8 @@ public final class SongTimeline {
 	 */
 	private void broadcastChangedSongs()
 	{
+		if (mCallback == null) return;
+
 		Song previous = getSong(-1);
 		Song current = getSong(0);
 		Song next = getSong(+1);