summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hennen <TomHennen@users.noreply.github.com>2015-08-26 18:27:19 -0400
committerTom Hennen <TomHennen@users.noreply.github.com>2015-08-26 18:27:19 -0400
commitf7edc797aeea503e78d2a0a3023664065da79415 (patch)
tree49acbac5ba2e844c969dac81aa12348558992771
parentb3719199f895280984af36f91df9f5d9d2aeeaa7 (diff)
parent9efe4f6eff59dd433a61bfd441768dcd43b7cba5 (diff)
downloadAntennaPod-f7edc797aeea503e78d2a0a3023664065da79415.zip
Merge pull request #1133 from TomHennen/fixnpe_mediaplayer
fix npe in media player
-rw-r--r--app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
index ef798f5b7..40a0d1801 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -256,7 +256,7 @@ public abstract class MediaplayerActivity extends ActionBarActivity
((FeedMedia) media).getItem().getFlattrStatus().flattrable()
);
- boolean hasWebsiteLink = media.getWebsiteLink() != null;
+ boolean hasWebsiteLink = media != null && media.getWebsiteLink() != null;
menu.findItem(R.id.visit_website_item).setVisible(hasWebsiteLink);
boolean isItemAndHasLink = media != null && (media instanceof FeedMedia) && ((FeedMedia) media).getItem().getLink() != null;