diff options
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java | 5 | ||||
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceTaskManager.java | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java index 95dad1749..0528fc3dc 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java +++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java @@ -218,6 +218,11 @@ public class DownloadService extends Service { nm.cancel(NOTIFICATION_ID); downloadCompletionThread.interrupt(); + try { + downloadCompletionThread.join(); + } catch (InterruptedException e) { + e.printStackTrace(); + } syncExecutor.shutdown(); schedExecutor.shutdown(); cancelNotificationUpdater(); diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceTaskManager.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceTaskManager.java index 70d9d9f77..736cf8cf2 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceTaskManager.java +++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceTaskManager.java @@ -11,6 +11,7 @@ import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import java.util.List; +import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.concurrent.ScheduledFuture; @@ -140,7 +141,7 @@ public class PlaybackServiceTaskManager { if (queueFuture.isDone()) { try { return queueFuture.get(); - } catch (InterruptedException | ExecutionException e) { + } catch (InterruptedException | ExecutionException | CancellationException e) { e.printStackTrace(); } } |