Merge pull request #1928 from AntennaPod/develop

Get casting fix in 1.6.0

2 files changed, 6 insertions, 1 deletions

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 b66826c0c..e6d41879c 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
@@ -701,7 +701,7 @@ public class PlaybackService extends Service {
         boolean isInQueue = false;
         FeedItem nextItem = null;
 
-        if (playable instanceof FeedMedia) {
+        if (playable instanceof FeedMedia && ((FeedMedia) playable).getItem() != null) {
             FeedMedia media = (FeedMedia) playable;
             FeedItem item = media.getItem();
 
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/RemotePSMP.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/RemotePSMP.java
index 287bb1776..4262b8a70 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/RemotePSMP.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/RemotePSMP.java
@@ -264,6 +264,11 @@ public class RemotePSMP extends PlaybackServiceMediaPlayer {
         if (!CastUtils.isCastable(playable)) {
             Log.d(TAG, "media provided is not compatible with cast device");
             callback.onMediaPlayerInfo(CAST_ERROR_PRIORITY_HIGH, R.string.cast_not_castable);
+            try {
+                playable.loadMetadata();
+            } catch (Playable.PlayableException e) {
+                Log.e(TAG, "Unable to load metadata of playable", e);
+            }
             callback.endPlayback(playable, startWhenPrepared, true, false);
             return;
         }