mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-09-20 03:44:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'robinst/dont-copy-from-id3v1-when-only-saving-id3v2'

Browse Source
This commit is contained in:
Lukáš Lalinský
2012-07-14 21:03:16 +02:00
parent fbb1c7e554 7279b4fb7b
commit 411d318f34
2 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
taglib/mpeg/mpegfile.cpp
View File

@ -207,12 +207,12 @@ bool MPEG::File::save(int tags, bool stripOthers, int id3v2Version)
}
// Create the tags if we've been asked to. Copy the values from the tag that
// does exist into the new tag.
// does exist into the new tag, except if the existing tag is to be stripped.
if((tags & ID3v2) && ID3v1Tag())
if((tags & ID3v2) && ID3v1Tag() && !(stripOthers && !(tags & ID3v1)))
Tag::duplicate(ID3v1Tag(), ID3v2Tag(true), false);
if((tags & ID3v1) && d->tag[ID3v2Index])
if((tags & ID3v1) && d->tag[ID3v2Index] && !(stripOthers && !(tags & ID3v2)))
Tag::duplicate(ID3v2Tag(), ID3v1Tag(true), false);
bool success = true;