From 3c76f4359fd9875d76412f49eb829869e5b80798 Mon Sep 17 00:00:00 2001
From: Christopher Eby <kreed@kreed.org>
Date: Sun, 28 Aug 2011 04:36:01 -0500
Subject: [PATCH] Fix duration improvement

---
 src/org/kreed/vanilla/FullPlaybackActivity.java | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/org/kreed/vanilla/FullPlaybackActivity.java b/src/org/kreed/vanilla/FullPlaybackActivity.java
index 30eade89..2706f5de 100644
--- a/src/org/kreed/vanilla/FullPlaybackActivity.java
+++ b/src/org/kreed/vanilla/FullPlaybackActivity.java
@@ -395,14 +395,18 @@ public class FullPlaybackActivity extends PlaybackActivity implements SeekBar.On
 		case MSG_UPDATE_SONG: {
 			Song song = (Song)message.obj;
 			if (song == null) {
-				mTitle.setText(null);
-				mAlbum.setText(null);
-				mArtist.setText(null);
+				if (mTitle != null) {
+					mTitle.setText(null);
+					mAlbum.setText(null);
+					mArtist.setText(null);
+				}
 				mDuration = 0;
 			} else {
-				mTitle.setText(song.title);
-				mAlbum.setText(song.album);
-				mArtist.setText(song.artist);
+				if (mTitle != null) {
+					mTitle.setText(song.title);
+					mAlbum.setText(song.album);
+					mArtist.setText(song.artist);
+				}
 				mDuration = song.duration;
 			}
 			updateProgress();