From 25d67c12c1c39235f5b4cb78e9c4c7c35a214c9e Mon Sep 17 00:00:00 2001
From: Alberto Griggio <agriggio@users.noreply.github.com>
Date: Mon, 4 Nov 2019 09:14:53 +0100
Subject: [PATCH] metadata: remove unwanted tags *after* merging XMP sidecars,
 not before

(cherry picked from commit b45666f61ac9c6083bdc22811351d72bf35497bb)
---
 rtengine/metadata.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rtengine/metadata.cc b/rtengine/metadata.cc
index c8aa3061d..bfcb3080e 100644
--- a/rtengine/metadata.cc
+++ b/rtengine/metadata.cc
@@ -187,10 +187,10 @@ void Exiv2Metadata::saveToImage(const Glib::ustring &path) const
     dst->readMetadata();
     if (image_.get()) {
         dst->setMetadata(*image_);
-        remove_unwanted(dst.get());
         if (merge_xmp_) {
             do_merge_xmp(dst.get());
         }
+        remove_unwanted(dst.get());
     } else {
         dst->setExifData(exif_data_);
         dst->setIptcData(iptc_data_);