diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2016-09-14 12:38:25 -0700 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2016-09-14 12:38:25 -0700 |
| commit | 09c787dfd2e406920b7d4daf75b7759d2c3b7c43 (patch) | |
| tree | daf02ccd077fdf220f0bcc34260bd7220d6e9455 /app/src/main/java/github/daneren2005/dsub/util/UserUtil.java | |
| parent | 9e3cef176e0431d97e13425fd503258807630425 (diff) | |
| parent | 5f0853a56d5214ab1c9d4238c500c8433d64e28e (diff) | |
| download | dsub-09c787dfd2e406920b7d4daf75b7759d2c3b7c43.tar.gz dsub-09c787dfd2e406920b7d4daf75b7759d2c3b7c43.tar.bz2 dsub-09c787dfd2e406920b7d4daf75b7759d2c3b7c43.zip | |
Merge branch 'edge' into internet-radio
Diffstat (limited to 'app/src/main/java/github/daneren2005/dsub/util/UserUtil.java')
| -rw-r--r-- | app/src/main/java/github/daneren2005/dsub/util/UserUtil.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/src/main/java/github/daneren2005/dsub/util/UserUtil.java b/app/src/main/java/github/daneren2005/dsub/util/UserUtil.java index 24d3906b..db1c628f 100644 --- a/app/src/main/java/github/daneren2005/dsub/util/UserUtil.java +++ b/app/src/main/java/github/daneren2005/dsub/util/UserUtil.java @@ -406,7 +406,7 @@ public final class UserUtil { } } - if(sampleUser.getMusicFolderSettings() != null) { + if(sampleUser != null && sampleUser.getMusicFolderSettings() != null) { for(User.Setting setting: sampleUser.getMusicFolderSettings()) { User.MusicFolderSetting musicFolderSetting = (User.MusicFolderSetting) setting; user.addMusicFolder(musicFolderSetting, true); |