Merge pull request #1575 from mfietz/issue/1574-add-to-already-queued

Feed view: "Remove from Queue" context menu item when queued

1 files changed, 4 insertions, 1 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java b/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java
index 06dbe4963..0224d2c7e 100644
--- a/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java
+++ b/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedItemMenuHandler.java
@@ -72,7 +72,10 @@ public class FeedItemMenuHandler {
             mi.setItemVisibility(R.id.skip_episode_item, false);
         }
 
-        boolean isInQueue = selectedItem.isTagged(FeedItem.TAG_QUEUE);
+        boolean isInQueue = false;
+        if(queueAccess != null) {
+            isInQueue = queueAccess.contains(selectedItem.getId());
+        }
         if(queueAccess == null || queueAccess.size() == 0 || queueAccess.get(0) == selectedItem.getId()) {
             mi.setItemVisibility(R.id.move_to_top_item, false);
         }