Applied suggestions

1 files changed, 8 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 fb6291234..0d7bbdae4 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
@@ -678,8 +678,8 @@ public class PlaybackService extends MediaBrowserServiceCompat {
                     break;
 
                 case STOPPED:
-                    writePlaybackPreferencesNoMediaPlaying();
-                    stopSelf();
+                    //writePlaybackPreferencesNoMediaPlaying();
+                    //stopSelf();
                     break;
 
                 case PLAYING:
@@ -1219,6 +1219,9 @@ public class PlaybackService extends MediaBrowserServiceCompat {
         }
         if (playable == null) {
             Log.d(TAG, "setupNotification: playable is null");
+            if (!started) {
+                stopSelf();
+            }
             return;
         }
         Runnable notificationSetupTask = new Runnable() {
@@ -1230,6 +1233,9 @@ public class PlaybackService extends MediaBrowserServiceCompat {
 
                 if (mediaPlayer == null) {
                     Log.d(TAG, "notificationSetupTask: mediaPlayer is null");
+                    if (!started) {
+                        stopSelf();
+                    }
                     return;
                 }