diff options
| author | Martin Fietz <Martin.Fietz@gmail.com> | 2018-05-05 18:41:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-05 18:41:48 +0200 |
| commit | 930330fbb46a25a7f1d6bce754836efb6f6cbfee (patch) | |
| tree | 2a4daae6ca7ee4c6ab2f79778bcb5fb5520b41af /core/src/main/java/de/danoeh/antennapod | |
| parent | 121f1d9d792e2682c847cf16855fc9a8d75e7152 (diff) | |
| parent | 304696d59e985ddd396685f9be22256f2c3f9aec (diff) | |
| download | AntennaPod-930330fbb46a25a7f1d6bce754836efb6f6cbfee.zip | |
Merge pull request #2675 from ByteHamster/delete-feed-while-playing
Stop playback service when feed is deleted
Diffstat (limited to 'core/src/main/java/de/danoeh/antennapod')
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/service/playback/LocalPSMP.java | 3 | ||||
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/LocalPSMP.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/LocalPSMP.java index af735aefd..0e64f484f 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/LocalPSMP.java +++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/LocalPSMP.java @@ -609,6 +609,9 @@ public class LocalPSMP extends PlaybackServiceMediaPlayer { public void shutdown() { executor.shutdown(); if (mediaPlayer != null) { + try { + mediaPlayer.stop(); + } catch (Exception ignore) { } mediaPlayer.release(); } releaseWifiLockIfNecessary(); diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java index 49de7ffe7..8cdf82e15 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java +++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java @@ -188,6 +188,9 @@ public class DBWriter { if(queue.remove(item)) { removed.add(item); } + if (item.getState() == FeedItem.State.PLAYING && PlaybackService.isRunning) { + context.stopService(new Intent(context, PlaybackService.class)); + } if (item.getMedia() != null && item.getMedia().isDownloaded()) { File mediaFile = new File(item.getMedia() |