dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Song: Only merge user set playcount and rating if set

Browse Source 
Fixes #790
This commit is contained in:
Jonas Kvinge
2021-10-18 00:39:26 +02:00
parent c78252e0d5
commit bd4eec4527
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/song.cpp
View File

@@ -1680,12 +1680,18 @@ void Song::ToXesam(QVariantMap *map) const {
void Song::MergeUserSetData(const Song &other) { void Song::MergeUserSetData(const Song &other) {
set_playcount(other.playcount()); if (other.playcount() > 0) {
set_playcount(other.playcount());
}
if (other.rating() > 0) {
set_rating(other.rating());
}
set_skipcount(other.skipcount()); set_skipcount(other.skipcount());
set_lastplayed(other.lastplayed()); set_lastplayed(other.lastplayed());
set_art_manual(other.art_manual()); set_art_manual(other.art_manual());
set_compilation_on(other.compilation_on()); set_compilation_on(other.compilation_on());
set_compilation_off(other.compilation_off()); set_compilation_off(other.compilation_off());
set_rating(other.rating());
} }