Merge branch 'master' into develop

1 files changed, 10 insertions, 10 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
index 370c4c301..8e070738c 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
@@ -80,17 +80,17 @@ public class ExternalPlayerFragment extends Fragment {
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         butPlay.setOnClickListener(v -> {
-            if (controller != null) {
-                if (controller.getMedia().getMediaType() == MediaType.VIDEO
-                        && controller.getStatus() != PlayerStatus.PLAYING) {
-                    controller.playPause();
-                    getContext().startActivity(PlaybackService
-                            .getPlayerActivityIntent(getContext(), controller.getMedia()));
-                } else {
-                    controller.playPause();
-                }
+            if (controller == null) {
+                return;
+            }
+            if (controller.getMedia() != null && controller.getMedia().getMediaType() == MediaType.VIDEO
+                    && controller.getStatus() != PlayerStatus.PLAYING) {
+                controller.playPause();
+                getContext().startActivity(PlaybackService
+                        .getPlayerActivityIntent(getContext(), controller.getMedia()));
+            } else {
+                controller.playPause();
             }
-
         });
         loadMediaInfo();
     }