Commit d43aa129 authored by Max Kellermann's avatar Max Kellermann

Tag: swap "base" and "add" in method Merge()

Fixes broken CUE sheet song tags (regression by commmit 7e8d254b).
parent ca69ad8b
...@@ -92,8 +92,8 @@ Tag::Tag(const Tag &other) ...@@ -92,8 +92,8 @@ Tag::Tag(const Tag &other)
Tag * Tag *
Tag::Merge(const Tag &base, const Tag &add) Tag::Merge(const Tag &base, const Tag &add)
{ {
TagBuilder builder(base); TagBuilder builder(add);
builder.Complement(add); builder.Complement(base);
return builder.Commit(); return builder.Commit();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment