From 47d23aa474e51464caa327a1a33402d057c0e651 Mon Sep 17 00:00:00 2001
From: Joshua Bahnsen <archrival@gmail.com>
Date: Thu, 18 Jul 2013 10:05:02 -0700
Subject: [PATCH] Fix null reference on A2DP broadcast

---
 AndroidManifest.xml                                    |  4 ++--
 src/com/thejoshwa/ultrasonic/androidapp/util/Util.java | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5597ce42..a16862cf 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:a="http://schemas.android.com/apk/res/android"
     package="com.thejoshwa.ultrasonic.androidapp"
     a:installLocation="auto"
-    a:versionCode="32"
-    a:versionName="1.2.0.5" >
+    a:versionCode="33"
+    a:versionName="1.2.0.6" >
 
     <uses-permission a:name="android.permission.INTERNET" />
     <uses-permission a:name="android.permission.READ_PHONE_STATE" />
diff --git a/src/com/thejoshwa/ultrasonic/androidapp/util/Util.java b/src/com/thejoshwa/ultrasonic/androidapp/util/Util.java
index d59ad79a..114f62ea 100644
--- a/src/com/thejoshwa/ultrasonic/androidapp/util/Util.java
+++ b/src/com/thejoshwa/ultrasonic/androidapp/util/Util.java
@@ -914,14 +914,16 @@ public class Util extends DownloadActivity {
 	}
 
 	public static void broadcastA2dpPlayStatusChange(Context context, PlayerState state, DownloadService downloadService) {
-		if (!Util.getShouldSendBluetoothNotifications(context)) {
+		if (!Util.getShouldSendBluetoothNotifications(context) || downloadService == null) {
 			return;
 		}
-		
-		if (downloadService.getCurrentPlaying() != null) {
+
+		DownloadFile currentPlaying = downloadService.getCurrentPlaying();
+
+		if (currentPlaying != null) {
 			Intent avrcpIntent = new Intent(CM_AVRCP_PLAYSTATE_CHANGED);
 
-			Entry song = downloadService.getCurrentPlaying().getSong();
+			Entry song = currentPlaying.getSong();
 			
 			if (song == null) {
 				return;