aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-12-13 15:53:58 +0100
committerMax Kellermann <max@duempel.org>2013-12-13 15:53:58 +0100
commitd43aa1298728f856d3d3a29477a91b79633022fe (patch)
tree0f0918f39e400072f38b38a21da9273872a41d91
parentca69ad8beb86241b33e73fbcb216f800460fe090 (diff)
downloadmpd-d43aa1298728f856d3d3a29477a91b79633022fe.tar.gz
mpd-d43aa1298728f856d3d3a29477a91b79633022fe.tar.xz
mpd-d43aa1298728f856d3d3a29477a91b79633022fe.zip
Tag: swap "base" and "add" in method Merge()
Fixes broken CUE sheet song tags (regression by commmit 7e8d254b).
-rw-r--r--src/tag/Tag.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tag/Tag.cxx b/src/tag/Tag.cxx
index ac96f40b2..acfd24260 100644
--- a/src/tag/Tag.cxx
+++ b/src/tag/Tag.cxx
@@ -92,8 +92,8 @@ Tag::Tag(const Tag &other)
Tag *
Tag::Merge(const Tag &base, const Tag &add)
{
- TagBuilder builder(base);
- builder.Complement(add);
+ TagBuilder builder(add);
+ builder.Complement(base);
return builder.Commit();
}