summaryrefslogtreecommitdiff
path: root/src/lib/dcp_content.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-02-08 20:57:03 +0000
committerCarl Hetherington <cth@carlh.net>2018-02-08 20:57:03 +0000
commitd9825793692a41374b184f423994667b663d8526 (patch)
treed1a4a1fd157ea55bbcbf47a6fa55b6c1679daf04 /src/lib/dcp_content.cc
parent2a574403f57ff980ca5e627d389f30e91bff02c7 (diff)
typeid() doesn't seem to downcast, so just check types in the take_settings_from methods (#1192).
Diffstat (limited to 'src/lib/dcp_content.cc')
-rw-r--r--src/lib/dcp_content.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index a6424874a..ad489917d 100644
--- a/src/lib/dcp_content.cc
+++ b/src/lib/dcp_content.cc
@@ -543,7 +543,9 @@ void
DCPContent::take_settings_from (shared_ptr<const Content> c)
{
shared_ptr<const DCPContent> dc = dynamic_pointer_cast<const DCPContent> (c);
- DCPOMATIC_ASSERT (dc);
+ if (!dc) {
+ return;
+ }
_reference_video = dc->_reference_video;
_reference_audio = dc->_reference_audio;