From 197d529fe6b552f1ea9e6d750a2003d33436bcde Mon Sep 17 00:00:00 2001
From: Christopher Eby <kreed@kreed.org>
Date: Sun, 21 Feb 2010 16:31:11 -0600
Subject: [PATCH] Ensure the MusicPlayer cleans up properly

---
 src/org/kreed/tumult/MusicPlayer.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/org/kreed/tumult/MusicPlayer.java b/src/org/kreed/tumult/MusicPlayer.java
index 051672f1..34c4f478 100644
--- a/src/org/kreed/tumult/MusicPlayer.java
+++ b/src/org/kreed/tumult/MusicPlayer.java
@@ -262,12 +262,14 @@ public class MusicPlayer implements Runnable, MediaPlayer.OnCompletionListener,
 	public void release()
 	{
 		if (mMediaPlayer != null) {
-			pause();
+			if (mMediaPlayer.isPlaying())
+				mMediaPlayer.pause();
 			mMediaPlayer.release();
 			mMediaPlayer = null;
 		}
 
 		mService.unregisterReceiver(mReceiver);
+		mService.stopForegroundCompat(NOTIFICATION_ID);
 
 		if (mWakeLock != null && mWakeLock.isHeld())
 			mWakeLock.release();