From d43aa1298728f856d3d3a29477a91b79633022fe Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Fri, 13 Dec 2013 15:53:58 +0100
Subject: Tag: swap "base" and "add" in method Merge()

Fixes broken CUE sheet song tags (regression by commmit 7e8d254b).
---
 src/tag/Tag.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

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();
 }
 
-- 
cgit v1.2.3