Keep playing episode when switching between day and night modes

1 files changed, 9 insertions, 2 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 b3200923b..c3e6b55ba 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
@@ -1407,8 +1407,15 @@ public class PlaybackService extends MediaBrowserServiceCompat {
                 Log.d(TAG, "Car was unplugged during playback.");
                 pauseIfPauseOnDisconnect();
             } else {
-                mediaPlayer.setStartWhenPrepared(true);
-                mediaPlayer.prepare();
+                PlayerStatus playerStatus = mediaPlayer.getPlayerStatus();
+                if (playerStatus == PlayerStatus.PAUSED || playerStatus == PlayerStatus.PREPARED) {
+                    mediaPlayer.resume();
+                } else if (playerStatus == PlayerStatus.PREPARING) {
+                    mediaPlayer.setStartWhenPrepared(!mediaPlayer.isStartWhenPrepared());
+                } else if (playerStatus == PlayerStatus.INITIALIZED) {
+                    mediaPlayer.setStartWhenPrepared(true);
+                    mediaPlayer.prepare();
+                }
             }
         }
     };