From 7a296848c77dc381d3b6dc7c64a7f697cfe9dddb Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Tue, 15 Apr 2014 18:17:26 -0700 Subject: Fix crash when resuming activity after staying on Downloads tab --- src/github/daneren2005/dsub/activity/SubsonicActivity.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/github') diff --git a/src/github/daneren2005/dsub/activity/SubsonicActivity.java b/src/github/daneren2005/dsub/activity/SubsonicActivity.java index 7d971093..878c68da 100644 --- a/src/github/daneren2005/dsub/activity/SubsonicActivity.java +++ b/src/github/daneren2005/dsub/activity/SubsonicActivity.java @@ -209,7 +209,9 @@ public class SubsonicActivity extends ActionBarActivity implements OnItemSelecte if(lastSelectedView == null) { lastSelectedView = drawerList.getChildAt(lastSelectedPosition); - lastSelectedView.setBackgroundResource(R.color.dividerColor); + if(lastSelectedView != null) { + lastSelectedView.setBackgroundResource(R.color.dividerColor); + } } getSupportActionBar().setTitle(R.string.common_appname); @@ -428,7 +430,7 @@ public class SubsonicActivity extends ActionBarActivity implements OnItemSelecte enabledItems[3] = chatEnabled; String fragmentType = getIntent().getStringExtra(Constants.INTENT_EXTRA_FRAGMENT_TYPE); - if(fragmentType != null) { + if(fragmentType != null && lastSelectedPosition == 0) { for(int i = 0; i < drawerItemsDescriptions.length; i++) { if(fragmentType.equals(drawerItemsDescriptions[i])) { lastSelectedPosition = drawerAdapter.getAdapterPosition(i); -- cgit v1.2.3