aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2014-04-15 18:17:26 -0700
committerScott Jackson <daneren2005@gmail.com>2014-04-15 18:17:26 -0700
commit7a296848c77dc381d3b6dc7c64a7f697cfe9dddb (patch)
tree05738c21d889addac1291510e33b01cb3994feb2
parent3c85cd674f5a2614a59d71012fbde25880af7768 (diff)
downloaddsub-7a296848c77dc381d3b6dc7c64a7f697cfe9dddb.tar.gz
dsub-7a296848c77dc381d3b6dc7c64a7f697cfe9dddb.tar.bz2
dsub-7a296848c77dc381d3b6dc7c64a7f697cfe9dddb.zip
Fix crash when resuming activity after staying on Downloads tab
-rw-r--r--src/github/daneren2005/dsub/activity/SubsonicActivity.java6
1 files changed, 4 insertions, 2 deletions
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);