From 6e8baf839a15b51cda75da96621dc7fbf1d00d25 Mon Sep 17 00:00:00 2001
From: Meir Schwarz <meir@imdde.com>
Date: Mon, 10 Apr 2017 15:27:24 -0700
Subject: [PATCH] Check media and mediaItem for null as suggested by mfietz

---
 .../antennapod/core/service/playback/PlaybackService.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
index 5f1912775..2d70d8258 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
@@ -405,7 +405,9 @@ public class PlaybackService extends MediaBrowserServiceCompat {
             Long feedId = Long.parseLong(parentId.split(":")[1]);
             List<FeedItem> feedItems = DBReader.getFeedItemList(DBReader.getFeed(feedId));
             for (FeedItem feedItem: feedItems) {
-                mediaItems.add(feedItem.getMedia().getMediaItem());
+                if(feedItem.getMedia() != null && feedItem.getMedia().getMediaItem() != null) {
+                    mediaItems.add(feedItem.getMedia().getMediaItem());
+                }
             }
         }
         result.sendResult(mediaItems);