2 files changed, 39 insertions, 4 deletions
diff --git a/src/de/danoeh/antennapod/activity/OrganizeQueueActivity.java b/src/de/danoeh/antennapod/activity/OrganizeQueueActivity.java
index 56e42f79f..50780844d 100644
--- a/src/de/danoeh/antennapod/activity/OrganizeQueueActivity.java
+++ b/src/de/danoeh/antennapod/activity/OrganizeQueueActivity.java
@@ -72,7 +72,10 @@ public class OrganizeQueueActivity extends SherlockListActivity {
 		@Override
 		public void drop(int from, int to) {
 			FeedManager manager = FeedManager.getInstance();
-			manager.moveQueueItem(OrganizeQueueActivity.this, from, to, false);
+			int offset = (manager.firstQueueItemIsPlaying()) ? 1 : 0;
+
+			manager.moveQueueItem(OrganizeQueueActivity.this, from + offset, to
+					+ offset, false);
 			adapter.notifyDataSetChanged();
 		}
 	};
@@ -82,6 +85,7 @@ public class OrganizeQueueActivity extends SherlockListActivity {
 		@Override
 		public void remove(int which) {
 			FeedManager manager = FeedManager.getInstance();
+
 			manager.removeQueueItem(OrganizeQueueActivity.this,
 					(FeedItem) getListAdapter().getItem(which));
 		}
@@ -110,9 +114,15 @@ public class OrganizeQueueActivity extends SherlockListActivity {
 		}
 	}
 
+	/**
+	 * WARNING: If the PlaybackService is playing an episode from the queue,
+	 * this list adapter will ignore the first item in the list to make sure
+	 * that the position of the first queue item cannot be changed.
+	 */
 	private static class OrganizeAdapter extends BaseAdapter {
 
 		private Context context;
+		private FeedManager manager = FeedManager.getInstance();
 
 		public OrganizeAdapter(Context context) {
 			super();
@@ -164,13 +174,22 @@ public class OrganizeQueueActivity extends SherlockListActivity {
 
 		@Override
 		public int getCount() {
-			return FeedManager.getInstance().getQueueSize(true);
+			int queueSize = manager.getQueueSize(true);
+			if (manager.firstQueueItemIsPlaying()) {
+				return queueSize - 1;
+			} else {
+				return queueSize;
+			}
 		}
 
 		@Override
 		public FeedItem getItem(int position) {
-			return FeedManager.getInstance()
-					.getQueueItemAtIndex(position, true);
+			if (manager.firstQueueItemIsPlaying() && position < getCount()) {
+				return manager.getQueueItemAtIndex(position + 1, true);
+			} else {
+				return manager.getQueueItemAtIndex(position, true);
+			}
+
 		}
 
 		@Override
diff --git a/src/de/danoeh/antennapod/feed/FeedManager.java b/src/de/danoeh/antennapod/feed/FeedManager.java
index 32e7f88f1..3203a5e21 100644
--- a/src/de/danoeh/antennapod/feed/FeedManager.java
+++ b/src/de/danoeh/antennapod/feed/FeedManager.java
@@ -1561,6 +1561,22 @@ public class FeedManager {
 	}
 
 	/**
+	 * Returns true if the first item in the queue is currently being played or
+	 * false otherwise. If the queue is empty, this method will also return
+	 * false.
+	 * */
+	public boolean firstQueueItemIsPlaying() {
+		FeedManager manager = FeedManager.getInstance();
+		int queueSize = manager.getQueueSize(true);
+		if (queueSize == 0) {
+			return false;
+		} else {
+			FeedItem item = getQueueItemAtIndex(0, true);
+			return item.getState() == FeedItem.State.PLAYING;
+		}
+	}
+
+	/**
 	 * Returns the number of unread items.
 	 * 
 	 * @param enableEpisodeFilter