aboutsummaryrefslogtreecommitdiff
path: root/src/github
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2014-08-14 20:40:09 -0700
committerScott Jackson <daneren2005@gmail.com>2014-08-14 20:40:09 -0700
commit9e5a86e13c44d2011460ddfe6e9de5f2ecba9934 (patch)
tree80391d1ace32b693544b7a523c06df688112aa43 /src/github
parenta717d2e6708561bec917758ef324172c72a0d3c9 (diff)
parent7469290d2f4ce7eb785f07866286337596802a28 (diff)
downloaddsub-9e5a86e13c44d2011460ddfe6e9de5f2ecba9934.tar.gz
dsub-9e5a86e13c44d2011460ddfe6e9de5f2ecba9934.tar.bz2
dsub-9e5a86e13c44d2011460ddfe6e9de5f2ecba9934.zip
Merge branch 'CacheUpdate' of https://github.com/daneren2005/Subsonic into CacheUpdate
Diffstat (limited to 'src/github')
-rw-r--r--src/github/daneren2005/dsub/service/CachedMusicService.java2
-rw-r--r--src/github/daneren2005/dsub/service/parser/StarredListParser.java4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/github/daneren2005/dsub/service/CachedMusicService.java b/src/github/daneren2005/dsub/service/CachedMusicService.java
index b8266913..5fe4a776 100644
--- a/src/github/daneren2005/dsub/service/CachedMusicService.java
+++ b/src/github/daneren2005/dsub/service/CachedMusicService.java
@@ -440,7 +440,7 @@ public class CachedMusicService implements MusicService {
@Override
public void updateResult(List<Entry> objects, Entry result) {
- result.setStarred(true);
+ result.setStarred(starred);
}
}.execute();
}
diff --git a/src/github/daneren2005/dsub/service/parser/StarredListParser.java b/src/github/daneren2005/dsub/service/parser/StarredListParser.java
index 6328d1b0..59652e29 100644
--- a/src/github/daneren2005/dsub/service/parser/StarredListParser.java
+++ b/src/github/daneren2005/dsub/service/parser/StarredListParser.java
@@ -53,6 +53,8 @@ public class StarredListParser extends MusicDirectoryEntryParser {
} else if("artist".equals(name)) {
MusicDirectory.Entry entry = parseArtist();
entry.setDirectory(true);
+ entry.setArtist(null);
+ entry.setParent(null);
dir.addChild(entry);
} else if ("error".equals(name)) {
handleError();
@@ -64,4 +66,4 @@ public class StarredListParser extends MusicDirectoryEntryParser {
return dir;
}
-} \ No newline at end of file
+}