projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7659cca
)
Fix find-missing-content.
author
Carl Hetherington
<cth@carlh.net>
Tue, 23 May 2017 10:53:01 +0000
(11:53 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Tue, 23 May 2017 10:53:01 +0000
(11:53 +0100)
src/wx/content_menu.cc
patch
|
blob
|
history
diff --git
a/src/wx/content_menu.cc
b/src/wx/content_menu.cc
index 42969995643eb2d94ffa9c0066574720e53f063c..174d625b8c1eea2fdee199f36b67203a83540cd7 100644
(file)
--- a/
src/wx/content_menu.cc
+++ b/
src/wx/content_menu.cc
@@
-300,7
+300,11
@@
ContentMenu::find_missing ()
list<shared_ptr<Content> > content;
if (r == wxID_OK) {
- content = content_factory (film, path);
+ if (dc) {
+ content.push_back (shared_ptr<DCPContent> (new DCPContent (film, path)));
+ } else {
+ content = content_factory (film, path);
+ }
}
if (content.empty ()) {
@@
-355,7
+359,7
@@
ContentMenu::maybe_found_missing (weak_ptr<Job> j, weak_ptr<Content> oc, weak_pt
return;
}
- old_content->set_path
(new_content->path (0
));
+ old_content->set_path
s (new_content->paths(
));
}
void