From 08a3106f1172208daa93078de3e5a35bf59a69fc Mon Sep 17 00:00:00 2001
From: Martin Fietz <Martin.Fietz@gmail.com>
Date: Sun, 1 Nov 2015 23:24:55 +0100
Subject: Check for null

---
 .../core/service/playback/PlaybackServiceTaskManager.java         | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'core/src/main')

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) {
-- 
cgit v1.2.3