X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_content.cc;fp=src%2Flib%2Faudio_content.cc;h=bd857b313d418da8fcc674ee25f8abd3ed8f3221;hb=a60668a37f05a125954ac5e03db0530995ac5769;hp=7083de714dcf411946c65598cdaf07d23e52ee32;hpb=f4fda1d705adfca0b7c8d3748c0c9df8e9da51bc;p=dcpomatic.git

diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index 7083de714..bd857b313 100644
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -405,15 +405,12 @@ AudioContent::take_settings_from (shared_ptr<const AudioContent> c)
 	set_fade_in (c->fade_in());
 	set_fade_out (c->fade_out());
 
-	size_t i = 0;
-	size_t j = 0;
+	auto const streams_to_take = std::min(_streams.size(), c->_streams.size());
 
-	while (i < _streams.size() && j < c->_streams.size()) {
+	for (auto i = 0U; i < streams_to_take; ++i) {
 		auto mapping = _streams[i]->mapping();
-		mapping.take_from(c->_streams[j]->mapping());
+		mapping.take_from(c->_streams[i]->mapping());
 		_streams[i]->set_mapping(mapping);
-		++i;
-		++j;
 	}
 }