projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d7e1406
)
Fix crash on DCP content with no subs.
author
Carl Hetherington
<cth@carlh.net>
Thu, 14 Apr 2016 14:04:43 +0000
(15:04 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 18 May 2016 10:50:29 +0000
(11:50 +0100)
src/lib/dcp_content.cc
patch
|
blob
|
history
diff --git
a/src/lib/dcp_content.cc
b/src/lib/dcp_content.cc
index 7a2d350de6b85e574953c0262d2cf55025b05cdc..b77c22714a2a00c48b4509343bae7b86c03cedc7 100644
(file)
--- a/
src/lib/dcp_content.cc
+++ b/
src/lib/dcp_content.cc
@@
-199,8
+199,11
@@
string
DCPContent::identifier () const
{
SafeStringStream s;
- s << Content::identifier() << "_" << video->identifier() << "_" << subtitle->identifier () << " "
- << (_reference_video ? "1" : "0")
+ s << Content::identifier() << "_" << video->identifier() << "_";
+ if (subtitle) {
+ s << subtitle->identifier () << " ";
+ }
+ s << (_reference_video ? "1" : "0")
<< (_reference_subtitle ? "1" : "0");
return s.str ();
}