Playbackservice now switches to next item in queue when completed

1 files changed, 7 insertions, 1 deletions

diff --git a/src/de/podfetcher/feed/FeedManager.java b/src/de/podfetcher/feed/FeedManager.java
index ecf7990cf..9e61bbd6a 100644
--- a/src/de/podfetcher/feed/FeedManager.java
+++ b/src/de/podfetcher/feed/FeedManager.java
@@ -209,7 +209,9 @@ public class FeedManager {
 		boolean removed = queue.remove(item);
 		if (removed) {
 			PodDBAdapter adapter = new PodDBAdapter(context);
+			adapter.open();
 			adapter.setQueue(queue);
+			adapter.close();
 		}
 	}
 
@@ -218,7 +220,11 @@ public class FeedManager {
 	}
 
 	public FeedItem getFirstQueueItem() {
-		return queue.get(0);
+		if (queue.isEmpty()) {
+			return null;
+		} else {
+			return queue.get(0);
+		}
 	}
 
 	private void addNewFeed(Context context, Feed feed) {