projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix crash in audio mapping view in various circumstances.
[dcpomatic.git]
/
src
/
wx
/
kdm_cpl_panel.cc
diff --git
a/src/wx/kdm_cpl_panel.cc
b/src/wx/kdm_cpl_panel.cc
index 341b5f764e842cde082e41a83040cf3a9b5c2eaa..967fb28457e98800aea5997ac3bdcd45b35affde 100644
(file)
--- a/
src/wx/kdm_cpl_panel.cc
+++ b/
src/wx/kdm_cpl_panel.cc
@@
-124,11
+124,14
@@
KDMCPLPanel::cpl_browse_clicked ()
}
if (!encrypted) {
}
if (!encrypted) {
- /* XXX: this needs to be marked translatable after 2.14.0 */
- error_dialog (this, wxT("This CPL contains no encrypted assets."));
+ error_dialog (this, _("This CPL contains no encrypted assets."));
return;
}
return;
}
+ /* We're ignoring the CPLSummary timestamp stuff here and just putting the new one in at the end
+ of the list, then selecting it.
+ */
+
try {
_cpls.push_back (
CPLSummary (
try {
_cpls.push_back (
CPLSummary (
@@
-136,7
+139,8
@@
KDMCPLPanel::cpl_browse_clicked ()
cpl_document.string_child("Id").substr (9),
cpl_document.string_child("ContentTitleText"),
cpl_file,
cpl_document.string_child("Id").substr (9),
cpl_document.string_child("ContentTitleText"),
cpl_file,
- encrypted
+ encrypted,
+ 0
)
);
} catch (cxml::Error) {
)
);
} catch (cxml::Error) {