From 6e340110d8211de2dfc76edf72c3043869862503 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Thu, 12 Mar 2015 11:22:50 -0700
Subject: Fix crash on selecting spinner if title is null

---
 src/github/daneren2005/dsub/activity/SubsonicActivity.java | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/github/daneren2005/dsub/activity/SubsonicActivity.java b/src/github/daneren2005/dsub/activity/SubsonicActivity.java
index 20ff568f..dab46779 100644
--- a/src/github/daneren2005/dsub/activity/SubsonicActivity.java
+++ b/src/github/daneren2005/dsub/activity/SubsonicActivity.java
@@ -670,9 +670,18 @@ public class SubsonicActivity extends ActionBarActivity implements OnItemSelecte
 		if(backStack.size() > 0) {
 			spinnerAdapter.clear();
 			for(int i = 0; i < backStack.size(); i++) {
-				spinnerAdapter.add(backStack.get(i).getTitle());
+				CharSequence title = backStack.get(i).getTitle();
+				if(title != null) {
+					spinnerAdapter.add(title);
+				} else {
+					spinnerAdapter.add("null");
+				}
+			}
+			if(currentFragment.getTitle() != null) {
+				spinnerAdapter.add(currentFragment.getTitle());
+			} else {
+				spinnerAdapter.add("null");
 			}
-			spinnerAdapter.add(currentFragment.getTitle());
 			spinnerAdapter.notifyDataSetChanged();
 			actionBarSpinner.setSelection(spinnerAdapter.getCount() - 1);
 			getSupportActionBar().setDisplayShowCustomEnabled(true);
-- 
cgit v1.2.3