X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fexport_handler.cc;h=cd3d61731d400a8d91268baa15f955520c0a16cf;hb=3d366053e2719ca0f129c16575ce481fcd214f61;hp=3cad72c8d9905aa35c4781a3aabe88891d2339a4;hpb=506863bf57940e277a3a129b5d4fcd0299a13015;p=ardour.git

diff --git a/libs/ardour/export_handler.cc b/libs/ardour/export_handler.cc
index 3cad72c8d9..cd3d61731d 100644
--- a/libs/ardour/export_handler.cc
+++ b/libs/ardour/export_handler.cc
@@ -227,7 +227,16 @@ ExportHandler::handle_duplicate_format_extensions()
 
 	ExtCountMap counts;
 	for (ConfigMap::iterator it = timespan_bounds.first; it != timespan_bounds.second; ++it) {
-		counts[it->second.format->extension()]++;
+		if (it->second.filename->include_channel_config && it->second.channel_config) {
+			/* stem-export has multiple files in the same timestamp, but a different channel_config for each.
+			 * However channel_config is only set in ExportGraphBuilder::Encoder::init_writer()
+			 * so we cannot yet use   it->second.filename->get_path(it->second.format).
+			 * We have to explicily check uniqueness of "channel-config + extension" here:
+			 */
+			counts[it->second.channel_config->name() + it->second.format->extension()]++;
+		} else {
+			counts[it->second.format->extension()]++;
+		}
 	}
 
 	bool duplicates_found = false;