diff options
| author | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-11-01 18:33:41 -0500 |
|---|---|---|
| committer | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-11-01 18:33:41 -0500 |
| commit | df11dbfe7a48c2c60e921d9273e7b7aa2c38f1b4 (patch) | |
| tree | 321fb31b3779ab2aac430edea1511627450e5776 /core/src/main | |
| parent | e24907e2714993b423a299aa862238058160dc2e (diff) | |
| parent | 08a3106f1172208daa93078de3e5a35bf59a69fc (diff) | |
| download | AntennaPod-df11dbfe7a48c2c60e921d9273e7b7aa2c38f1b4.zip | |
Merge pull request #1327 from mfietz/issue/1229
Sleep timer: Fix sleeping when shake to reset is not enabled
Diffstat (limited to 'core/src/main')
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceTaskManager.java | 8 |
1 files changed, 6 insertions, 2 deletions
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 19ef6ef09..9c3ff4413 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 @@ -366,10 +366,14 @@ public class PlaybackServiceTaskManager { } if (waitingTime <= 0) { Log.d(TAG, "Sleep timer expired"); - shakeListener.pause(); - shakeListener = null; + if(shakeListener != null) { + shakeListener.pause(); + shakeListener = null; + } if (!Thread.currentThread().isInterrupted()) { callback.onSleepTimerExpired(); + } else { + Log.d(TAG, "Sleep timer interrupted"); } } } catch (InterruptedException e) { |