diff options
| author | ByteHamster <info@bytehamster.com> | 2018-05-05 18:23:29 +0200 |
|---|---|---|
| committer | ByteHamster <info@bytehamster.com> | 2018-05-05 18:24:32 +0200 |
| commit | 304696d59e985ddd396685f9be22256f2c3f9aec (patch) | |
| tree | 0a34df59bb5eaa03e31abe1c58ad72eb5c9156ed /core/src/main/java/de | |
| parent | e16a111a12946531b5fa81d77206aa6bfc2ab318 (diff) | |
| download | AntennaPod-304696d59e985ddd396685f9be22256f2c3f9aec.zip | |
Stop playback service when item of deleted feed is played
Closes #2425
Diffstat (limited to 'core/src/main/java/de')
| -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() |