Merge pull request #783 from TomHennen/fix_npe_on_shutdown

Fixes NPE in PlaybackWidgetService

1 files changed, 14 insertions, 13 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetService.java b/app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetService.java
index 1d9e8e412..0d00823d3 100644
--- a/app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetService.java
+++ b/app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetService.java
@@ -52,19 +52,20 @@ public class PlayerWidgetService extends Service {
 	public void onDestroy() {
 		super.onDestroy();
 		Log.d(TAG, "Service is about to be destroyed");
-
-		Playable playable = playbackService.getPlayable();
-		if(playable != null && playable instanceof FeedMedia) {
-			FeedMedia media = (FeedMedia) playable;
-			if(media.hasAlmostEnded()) {
-				Log.d(TAG, "smart mark as read");
-				FeedItem item = media.getItem();
-				DBWriter.markItemRead(this, item, true, false);
-				DBWriter.removeQueueItem(this, item, false);
-				DBWriter.addItemToPlaybackHistory(this, media);
-				if (UserPreferences.isAutoDelete()) {
-					Log.d(TAG, "Delete " + media.toString());
-					DBWriter.deleteFeedMediaOfItem(this, media.getId());
+		if (playbackService != null) {
+			Playable playable = playbackService.getPlayable();
+			if (playable != null && playable instanceof FeedMedia) {
+				FeedMedia media = (FeedMedia) playable;
+				if (media.hasAlmostEnded()) {
+					Log.d(TAG, "smart mark as read");
+					FeedItem item = media.getItem();
+					DBWriter.markItemRead(this, item, true, false);
+					DBWriter.removeQueueItem(this, item, false);
+					DBWriter.addItemToPlaybackHistory(this, media);
+					if (UserPreferences.isAutoDelete()) {
+						Log.d(TAG, "Delete " + media.toString());
+						DBWriter.deleteFeedMediaOfItem(this, media.getId());
+					}
 				}
 			}
 		}