From b14299e6da5ad0476cbd8f39c8b7170a8c46e3c6 Mon Sep 17 00:00:00 2001
From: Adrian Ulrich <adrian@blinkenlights.ch>
Date: Fri, 19 Oct 2012 16:31:56 +0200
Subject: [PATCH] do not call setDataSource() if we are going to destroy the
 object anyway

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

diff --git a/src/ch/blinkenlights/android/vanilla/PlaybackService.java b/src/ch/blinkenlights/android/vanilla/PlaybackService.java
index 9efe4b34..fb81bab9 100644
--- a/src/ch/blinkenlights/android/vanilla/PlaybackService.java
+++ b/src/ch/blinkenlights/android/vanilla/PlaybackService.java
@@ -1104,8 +1104,6 @@ public final class PlaybackService extends Service
 		try {
 			mMediaPlayerInitialized = false;
 			mMediaPlayer.reset();
-			mMediaPlayer.setDataSource(song.path);
-			mMediaPlayer.prepare();
 			
 			if(mPreparedMediaPlayer != null &&
 			   mPreparedMediaPlayer.isPlaying()) {
@@ -1114,6 +1112,10 @@ public final class PlaybackService extends Service
 				mMediaPlayer = mPreparedMediaPlayer;
 				mPreparedMediaPlayer = null;
 			}
+			else {
+				mMediaPlayer.setDataSource(song.path);
+				mMediaPlayer.prepare();
+			}
 			
 			mMediaPlayerInitialized = true;
 			triggerGaplessUpdate();