diff options
author | Domingos Lopes <domingos86lopes+github@gmail.com> | 2016-06-03 16:44:19 -0400 |
---|---|---|
committer | Domingos Lopes <domingos86lopes+github@gmail.com> | 2016-06-08 22:49:03 -0400 |
commit | b46b2247b46f36f28e14e536c9f8ce605091b015 (patch) | |
tree | 92ea7dcef1e8ccef1131711d9210e36af0cf7d7c /app/src | |
parent | 405630ee502819f7214f77ab49c484f4c7fd918c (diff) | |
download | AntennaPod-b46b2247b46f36f28e14e536c9f8ce605091b015.zip |
fixes NPE from #1974
Diffstat (limited to 'app/src')
-rw-r--r-- | app/src/play/java/de/danoeh/antennapod/activity/CastEnabledActivity.java | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/app/src/play/java/de/danoeh/antennapod/activity/CastEnabledActivity.java b/app/src/play/java/de/danoeh/antennapod/activity/CastEnabledActivity.java index b8856c295..1b6126d24 100644 --- a/app/src/play/java/de/danoeh/antennapod/activity/CastEnabledActivity.java +++ b/app/src/play/java/de/danoeh/antennapod/activity/CastEnabledActivity.java @@ -67,9 +67,16 @@ public abstract class CastEnabledActivity extends AppCompatActivity @CallSuper public boolean onPrepareOptionsMenu(Menu menu) { super.onPrepareOptionsMenu(menu); - mediaRouteActionProvider = castManager - .addMediaRouterButton(menu.findItem(R.id.media_route_menu_item)); - mediaRouteActionProvider.setEnabled(castButtonVisibilityManager.shouldEnable()); + MenuItem mediaRouteButton = menu.findItem(R.id.media_route_menu_item); + if (mediaRouteButton == null) { + Log.wtf(TAG, "MediaRoute item could not be found on the menu!"); + mediaRouteActionProvider = null; + return true; + } + mediaRouteActionProvider = castManager.addMediaRouterButton(mediaRouteButton); + if (mediaRouteActionProvider != null) { + mediaRouteActionProvider.setEnabled(castButtonVisibilityManager.shouldEnable()); + } return true; } |