Merge pull request #2832 from ByteHamster/null-media-player

Do not crash if mediaPlayer is null

2 files changed, 8 insertions, 2 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/PlayerWidgetJobService.java b/core/src/main/java/de/danoeh/antennapod/core/service/PlayerWidgetJobService.java
index 4f0da82fb..d2214cac8 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/PlayerWidgetJobService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/PlayerWidgetJobService.java
@@ -44,8 +44,8 @@ public class PlayerWidgetJobService extends JobIntentService {
             return;
         }
 
-        if (PlaybackService.isRunning && playbackService == null) {
-            synchronized (waitForService) {
+        synchronized (waitForService) {
+            if (PlaybackService.isRunning && playbackService == null) {
                 bindService(new Intent(this, PlaybackService.class), mConnection, 0);
                 while (playbackService == null) {
                     try {
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 fc36ad004..979857381 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
@@ -1685,6 +1685,9 @@ public class PlaybackService extends MediaBrowserServiceCompat {
      * an invalid state.
      */
     public int getDuration() {
+        if (mediaPlayer == null) {
+            return INVALID_TIME;
+        }
         return mediaPlayer.getDuration();
     }
 
@@ -1693,6 +1696,9 @@ public class PlaybackService extends MediaBrowserServiceCompat {
      * is in an invalid state.
      */
     public int getCurrentPosition() {
+        if (mediaPlayer == null) {
+            return INVALID_TIME;
+        }
         return mediaPlayer.getPosition();
     }