From 517104b7b8726dc26f5aea5a4414a5e66fe1e849 Mon Sep 17 00:00:00 2001 From: Adrian Ulrich Date: Tue, 7 Oct 2014 21:00:20 +0200 Subject: [PATCH] avoid crashing if song is null --- .../android/vanilla/ShowQueueAdapter.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/ch/blinkenlights/android/vanilla/ShowQueueAdapter.java b/src/ch/blinkenlights/android/vanilla/ShowQueueAdapter.java index d9661a83..78bf1c44 100644 --- a/src/ch/blinkenlights/android/vanilla/ShowQueueAdapter.java +++ b/src/ch/blinkenlights/android/vanilla/ShowQueueAdapter.java @@ -58,14 +58,16 @@ public class ShowQueueAdapter extends ArrayAdapter { LayoutInflater inflater = ((Activity)context).getLayoutInflater(); View row = inflater.inflate(resource, parent, false); Song song = getItem(position); - TextView target = ((TextView)row.findViewById(R.id.text)); - SpannableStringBuilder sb = new SpannableStringBuilder(song.title); - sb.append('\n'); - sb.append(song.album+", "+song.artist); - sb.setSpan(new ForegroundColorSpan(Color.GRAY), song.title.length() + 1, sb.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); - - target.setText(sb); - + + if (song != null) { // unlikely to fail but seems to happen in the wild. + TextView target = ((TextView)row.findViewById(R.id.text)); + SpannableStringBuilder sb = new SpannableStringBuilder(song.title); + sb.append('\n'); + sb.append(song.album+", "+song.artist); + sb.setSpan(new ForegroundColorSpan(Color.GRAY), song.title.length() + 1, sb.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + target.setText(sb); + } + View pmark = ((View)row.findViewById(R.id.playmark)); pmark.setVisibility( ( position == this.hl_row ? View.VISIBLE : View.INVISIBLE ));