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

@@ -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());
+  }
 }