diff options
| author | Martin Fietz <Martin.Fietz@gmail.com> | 2018-09-27 13:52:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-27 13:52:35 +0200 |
| commit | c7ec2f26c62ada1a95a2b1ef12eda2f4e71bebc9 (patch) | |
| tree | c2713a00fdc4558ab6e40fc7f2c4a647faf818bc /core/src/main/java/de/danoeh/antennapod | |
| parent | aad32c98c3615611d9ff8e0f3a7adf5f7f847688 (diff) | |
| parent | 7dc5d9cfb1d6d7920902a10f4671177c5ffa5cbf (diff) | |
| download | AntennaPod-c7ec2f26c62ada1a95a2b1ef12eda2f4e71bebc9.zip | |
Merge pull request #2834 from ByteHamster/npe-remote-psmp
Allow mediaPlayer to be null
Diffstat (limited to 'core/src/main/java/de/danoeh/antennapod')
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java index a7c01e43a..fc36ad004 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java +++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java @@ -660,7 +660,12 @@ public class PlaybackService extends MediaBrowserServiceCompat { private final PlaybackServiceMediaPlayer.PSMPCallback mediaPlayerCallback = new PlaybackServiceMediaPlayer.PSMPCallback() { @Override public void statusChanged(PlaybackServiceMediaPlayer.PSMPInfo newInfo) { - currentMediaType = mediaPlayer.getCurrentMediaType(); + if (mediaPlayer != null) { + currentMediaType = mediaPlayer.getCurrentMediaType(); + } else { + currentMediaType = MediaType.UNKNOWN; + } + updateMediaSession(newInfo.playerStatus); switch (newInfo.playerStatus) { case INITIALIZED: |