From 9e9b7f7fa6880156e8e8d0618d132272e3261bb8 Mon Sep 17 00:00:00 2001 From: David Sansome Date: Wed, 26 Dec 2012 00:26:48 +1100 Subject: [PATCH] Don't ever replace taglib metadata on file:// Songs. init_from_file_ gets lost after a restart so just assume all local files are good. --- src/core/song.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/core/song.cpp b/src/core/song.cpp index 9b361379a..9ef99d2c9 100644 --- a/src/core/song.cpp +++ b/src/core/song.cpp @@ -926,8 +926,10 @@ void Song::InitFromLastFM(const lastfm::Track& track) { #endif // Q_OS_WIN32 void Song::MergeFromSimpleMetaBundle(const Engine::SimpleMetaBundle &bundle) { - if (d->init_from_file_) { - // This Song was already loaded using taglib. Our tags are probably better than the engine's. + if (d->init_from_file_ || d->url_.scheme() == "file") { + // This Song was already loaded using taglib. Our tags are probably better + // than the engine's. Note: init_from_file_ is used for non-file:// URLs + // when the metadata is known to be good, like from Jamendo. return; }