projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix font_id_map errors when importing DCP subtitles that have no
[dcpomatic.git]
/
src
/
tools
/
dcpomatic_kdm.cc
diff --git
a/src/tools/dcpomatic_kdm.cc
b/src/tools/dcpomatic_kdm.cc
index 30f2e0b827f9b3b999a5897c66b9fe76d7a2aee0..f877ad21f8510d4848f4f162660e563440aca29b 100644
(file)
--- a/
src/tools/dcpomatic_kdm.cc
+++ b/
src/tools/dcpomatic_kdm.cc
@@
-289,7
+289,7
@@
private:
if (id) {
*id = 0;
}
if (id) {
*id = 0;
}
- return
shared_ptr<DKDMBase> ()
;
+ return
{}
;
}
if (id) {
}
if (id) {
@@
-298,7
+298,7
@@
private:
auto i = _dkdm_id.find (selections[0]);
if (i == _dkdm_id.end()) {
auto i = _dkdm_id.find (selections[0]);
if (i == _dkdm_id.end()) {
- return
shared_ptr<DKDMBase> ()
;
+ return
{}
;
}
return i->second;
}
return i->second;
@@
-526,11
+526,13
@@
private:
} else {
/* Add base to the view */
wxTreeItemId added;
} else {
/* Add base to the view */
wxTreeItemId added;
+ auto parent_id = dkdm_to_id(base->parent());
if (previous) {
if (previous) {
- added = _dkdm->InsertItem(
dkdm_to_id(base->parent())
, *previous, std_to_wx(base->name()));
+ added = _dkdm->InsertItem(
parent_id
, *previous, std_to_wx(base->name()));
} else {
} else {
- added = _dkdm->AppendItem(
dkdm_to_id(base->parent())
, std_to_wx(base->name()));
+ added = _dkdm->AppendItem(
parent_id
, std_to_wx(base->name()));
}
}
+ _dkdm->SortChildren(parent_id);
_dkdm_id[added] = base;
}
_dkdm_id[added] = base;
}
@@
-643,7
+645,7
@@
private:
try {
wxInitAllImageHandlers ();
try {
wxInitAllImageHandlers ();
- Config::FailedToLoad.connect
(boost::bind (&App::config_failed_to_load, this
));
+ Config::FailedToLoad.connect
(boost::bind(&App::config_failed_to_load, this, _1
));
Config::Warning.connect (boost::bind (&App::config_warning, this, _1));
splash = maybe_show_splash ();
Config::Warning.connect (boost::bind (&App::config_warning, this, _1));
splash = maybe_show_splash ();
@@
-745,9
+747,9
@@
private:
signal_manager->ui_idle ();
}
signal_manager->ui_idle ();
}
- void config_failed_to_load
(
)
+ void config_failed_to_load
(Config::LoadFailure what
)
{
{
-
message_dialog (_frame, _("The existing configuration failed to load. Default values will be used instead. These may take a short time to create.")
);
+
report_config_load_failure(_frame, what
);
}
void config_warning (string m)
}
void config_warning (string m)