From eb8817929787901d1975a0ec66b4706c2aca56f7 Mon Sep 17 00:00:00 2001
From: Christopher Eby <kreed@kreed.org>
Date: Thu, 18 Mar 2010 19:59:06 -0500
Subject: [PATCH] Don't crash when the service is already disconnected and
 update state to allow reconnection

---
 src/org/kreed/vanilla/PlaybackServiceActivity.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/org/kreed/vanilla/PlaybackServiceActivity.java b/src/org/kreed/vanilla/PlaybackServiceActivity.java
index 6568c6e0..a787952e 100644
--- a/src/org/kreed/vanilla/PlaybackServiceActivity.java
+++ b/src/org/kreed/vanilla/PlaybackServiceActivity.java
@@ -44,6 +44,8 @@ public abstract class PlaybackServiceActivity extends Activity implements Servic
 		filter.addAction(PlaybackService.EVENT_CHANGED);
 		filter.addAction(PlaybackService.EVENT_LOADED);
 		registerReceiver(mReceiver, filter);
+
+		setState(PlaybackService.STATE_NORMAL);
 	}
 
 	@Override
@@ -51,7 +53,11 @@ public abstract class PlaybackServiceActivity extends Activity implements Servic
 	{
 		super.onStop();
 
-		unbindService(this);
+		try {
+			unbindService(this);
+		} catch (IllegalArgumentException e) {
+			// we have not registered the service yet
+		}
 		try {
 			unregisterReceiver(mReceiver);
 		} catch (IllegalArgumentException e) {