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

Fixes broken CUE sheet song tags (regression by commmit 7e8d254b).

Tag: swap "base" and "add" in method Merge()
d43aa129 · Max Kellermann · ca69ad8b · d43aa129
Commit d43aa129 authored Dec 13, 2013 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Tag.cxx src/tag/Tag.cxx +2 -2

No files found.
--- 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);
+	TagBuilder builder(add);
-	builder.Complement(add);
+	builder.Complement(base);
 	return builder.Commit();
 }