Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'alphapapa-read-new-ratings-from-files'

Browse Source
This commit is contained in:
Arnaud Bienner 2015-04-25 18:33:29 +02:00
commit 44cd2f916c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/song.cpp
View File

@ -1065,6 +1065,7 @@ bool Song::IsMetadataEqual(const Song& other) const {
d->samplerate_ == other.d->samplerate_ && d->samplerate_ == other.d->samplerate_ &&
d->art_automatic_ == other.d->art_automatic_ && d->art_automatic_ == other.d->art_automatic_ &&
d->art_manual_ == other.d->art_manual_ && d->art_manual_ == other.d->art_manual_ &&
d->rating_ == other.d->rating_ &&
d->cue_path_ == other.d->cue_path_ && d->cue_path_ == other.d->cue_path_ &&
d->lyrics_ == other.d->lyrics_; d->lyrics_ == other.d->lyrics_;
} }
@ -1141,7 +1142,6 @@ void Song::MergeUserSetData(const Song& other) {
set_playcount(other.playcount()); set_playcount(other.playcount());
set_skipcount(other.skipcount()); set_skipcount(other.skipcount());
set_lastplayed(other.lastplayed()); set_lastplayed(other.lastplayed());
set_rating(other.rating());
set_score(other.score()); set_score(other.score());
set_art_manual(other.art_manual()); set_art_manual(other.art_manual());
} }