diff options
author | daniel oeh <daniel.oeh@gmail.com> | 2014-07-07 21:34:37 +0200 |
---|---|---|
committer | daniel oeh <daniel.oeh@gmail.com> | 2014-07-07 21:34:37 +0200 |
commit | af4929728fb0c43008cef6a659de45f32fe12788 (patch) | |
tree | 92aadfcbf305cc24f47cad08c1dcddf58c4d49ac /src | |
parent | 74294bad557e7079dac30b45853cba1271046d6f (diff) | |
download | AntennaPod-af4929728fb0c43008cef6a659de45f32fe12788.zip |
Fixed NullPointerException in FeedMedia
Diffstat (limited to 'src')
-rw-r--r-- | src/de/danoeh/antennapod/feed/FeedMedia.java | 4 | ||||
-rw-r--r-- | src/de/danoeh/antennapod/service/playback/PlaybackServiceMediaPlayer.java | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/de/danoeh/antennapod/feed/FeedMedia.java b/src/de/danoeh/antennapod/feed/FeedMedia.java index 1f8e7f8f8..dc941cb48 100644 --- a/src/de/danoeh/antennapod/feed/FeedMedia.java +++ b/src/de/danoeh/antennapod/feed/FeedMedia.java @@ -401,7 +401,9 @@ public class FeedMedia extends FeedFile implements Playable { @Override public String getImageLoaderCacheKey() { String out; - if (item.hasItemImageDownloaded()) { + if (item == null) { + return null; + } else if (item.hasItemImageDownloaded()) { out = item.getImageLoaderCacheKey(); } else { out = new Playable.DefaultPlayableImageLoader(this) diff --git a/src/de/danoeh/antennapod/service/playback/PlaybackServiceMediaPlayer.java b/src/de/danoeh/antennapod/service/playback/PlaybackServiceMediaPlayer.java index ea99d882d..477eea9a6 100644 --- a/src/de/danoeh/antennapod/service/playback/PlaybackServiceMediaPlayer.java +++ b/src/de/danoeh/antennapod/service/playback/PlaybackServiceMediaPlayer.java @@ -126,6 +126,7 @@ public class PlaybackServiceMediaPlayer { try { playMediaObject(playable, false, stream, startWhenPrepared, prepareImmediately); } catch (RuntimeException e) { + e.printStackTrace(); throw e; } finally { playerLock.unlock(); |