aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2013-11-18 19:47:34 -0800
committerScott Jackson <daneren2005@gmail.com>2013-11-18 19:47:34 -0800
commitb7145d12696fdc5167dd7214e94a65d963ad83ff (patch)
tree85500ab8bcaf7f87f1c423955cd6e23a6084ac71 /src
parentfb7cd64529d387f80a2303d7d1f4563cc1f70581 (diff)
downloaddsub-b7145d12696fdc5167dd7214e94a65d963ad83ff.tar.gz
dsub-b7145d12696fdc5167dd7214e94a65d963ad83ff.tar.bz2
dsub-b7145d12696fdc5167dd7214e94a65d963ad83ff.zip
Fix crash/web commit
Diffstat (limited to 'src')
-rw-r--r--src/github/daneren2005/dsub/fragments/DownloadFragment.java2
-rw-r--r--src/github/daneren2005/dsub/fragments/SubsonicFragment.java1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/github/daneren2005/dsub/fragments/DownloadFragment.java b/src/github/daneren2005/dsub/fragments/DownloadFragment.java
index c135edd3..a9dd6541 100644
--- a/src/github/daneren2005/dsub/fragments/DownloadFragment.java
+++ b/src/github/daneren2005/dsub/fragments/DownloadFragment.java
@@ -741,7 +741,7 @@ public class DownloadFragment extends SubsonicFragment implements OnGestureListe
updateButtons();
- if(currentPlaying == null && currentPlaying == getDownloadService().getCurrentPlaying()) {
+ if(currentPlaying == null && downloadService != null && currentPlaying == downloadService.getCurrentPlaying()) {
getImageLoader().loadImage(albumArtImageView, null, true, false);
}
}
diff --git a/src/github/daneren2005/dsub/fragments/SubsonicFragment.java b/src/github/daneren2005/dsub/fragments/SubsonicFragment.java
index 0078312a..9aba972d 100644
--- a/src/github/daneren2005/dsub/fragments/SubsonicFragment.java
+++ b/src/github/daneren2005/dsub/fragments/SubsonicFragment.java
@@ -187,6 +187,7 @@ public class SubsonicFragment extends Fragment {
}
}
} else if(selected instanceof Artist) {
+ Artist artist = (Artist) selected;
if(Util.isOffline(context)) {
inflater.inflate(R.menu.select_artist_context_offline, menu);
}