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.

This commit is contained in:
David Sansome 2012-12-26 00:26:48 +11:00
parent 24219b93cc
commit 9e9b7f7fa6
1 changed files with 4 additions and 2 deletions

View File

@ -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;
}