From 2418b559a8325f1a27947c679bbd6b6bca395df5 Mon Sep 17 00:00:00 2001 From: Marko Hauptvogel Date: Sun, 17 Apr 2016 19:23:36 -0700 Subject: [PATCH] Fix rating preservation This is a bugfix for commit bb5a952e to prevent deletion of database-only ratings. (cherry picked from commit c0e08d42ed0b69f8ffb0809c2735f3ff7dfebce9) --- src/core/song.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/core/song.cpp b/src/core/song.cpp index ed95eca7a..38aa4dbbd 100644 --- a/src/core/song.cpp +++ b/src/core/song.cpp @@ -1165,4 +1165,7 @@ void Song::MergeUserSetData(const Song& other) { set_lastplayed(other.lastplayed()); set_score(other.score()); set_art_manual(other.art_manual()); + if (rating() == -1.0f) { + set_rating(other.rating()); + } }