projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix crashes when using templates in some cases (#2491).
[dcpomatic.git]
/
src
/
lib
/
audio_content.cc
diff --git
a/src/lib/audio_content.cc
b/src/lib/audio_content.cc
index 6a93ff11943cd66958116266408bd6e9267117bc..7083de714dcf411946c65598cdaf07d23e52ee32 100644
(file)
--- a/
src/lib/audio_content.cc
+++ b/
src/lib/audio_content.cc
@@
-409,7
+409,9
@@
AudioContent::take_settings_from (shared_ptr<const AudioContent> c)
size_t j = 0;
while (i < _streams.size() && j < c->_streams.size()) {
size_t j = 0;
while (i < _streams.size() && j < c->_streams.size()) {
- _streams[i]->set_mapping (c->_streams[j]->mapping());
+ auto mapping = _streams[i]->mapping();
+ mapping.take_from(c->_streams[j]->mapping());
+ _streams[i]->set_mapping(mapping);
++i;
++j;
}
++i;
++j;
}