diff options
author | daniel oeh <daniel.oeh@gmail.com> | 2012-07-16 11:09:43 +0200 |
---|---|---|
committer | daniel oeh <daniel.oeh@gmail.com> | 2012-07-16 11:09:43 +0200 |
commit | ea67e94edb995f9a4fb19e9e55cd8e4b7a8c98d5 (patch) | |
tree | ab0c810cf24ac93acb861780f2aced12da1b72ac /src/de/danoeh/antennapod | |
parent | 4003ede4a722491cac952b1c1dee171581158cb7 (diff) | |
download | AntennaPod-ea67e94edb995f9a4fb19e9e55cd8e4b7a8c98d5.zip |
Fixed nullpointer exception when preparing menu
Diffstat (limited to 'src/de/danoeh/antennapod')
-rw-r--r-- | src/de/danoeh/antennapod/activity/MediaplayerActivity.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/de/danoeh/antennapod/activity/MediaplayerActivity.java b/src/de/danoeh/antennapod/activity/MediaplayerActivity.java index d5f0939bc..2cc4406e9 100644 --- a/src/de/danoeh/antennapod/activity/MediaplayerActivity.java +++ b/src/de/danoeh/antennapod/activity/MediaplayerActivity.java @@ -127,9 +127,10 @@ public class MediaplayerActivity extends SherlockFragmentActivity implements @Override public boolean onPrepareOptionsMenu(Menu menu) { - menu.findItem(R.id.support_item).setVisible(media.getItem().getPaymentLink() != null); - menu.findItem(R.id.share_link_item).setVisible(media.getItem().getLink() != null); - menu.findItem(R.id.visit_website_item).setVisible(media.getItem().getLink() != null); + + menu.findItem(R.id.support_item).setVisible(media != null && media.getItem().getPaymentLink() != null); + menu.findItem(R.id.share_link_item).setVisible(media != null && media.getItem().getLink() != null); + menu.findItem(R.id.visit_website_item).setVisible(media != null && media.getItem().getLink() != null); return true; } @@ -498,7 +499,7 @@ public class MediaplayerActivity extends SherlockFragmentActivity implements int requestedOrientation; status = playbackService.getStatus(); media = playbackService.getMedia(); - + invalidateOptionsMenu(); registerReceiver(statusUpdate, new IntentFilter( PlaybackService.ACTION_PLAYER_STATUS_CHANGED)); |