projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c31552d
)
Re-examine joined content.
author
Carl Hetherington
<cth@carlh.net>
Thu, 30 Jun 2016 21:37:03 +0000
(22:37 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Thu, 30 Jun 2016 21:37:03 +0000
(22:37 +0100)
src/wx/content_menu.cc
patch
|
blob
|
history
diff --git
a/src/wx/content_menu.cc
b/src/wx/content_menu.cc
index d5e190adf9e6b7ab80a54191db69c09bd6f62539..70fc766ac9c14135590b9b9b15225eda8031dfe1 100644
(file)
--- a/
src/wx/content_menu.cc
+++ b/
src/wx/content_menu.cc
@@
-161,7
+161,7
@@
ContentMenu::join ()
try {
shared_ptr<FFmpegContent> joined (new FFmpegContent (film, fc));
film->remove_content (_content);
- film->add_content (joined);
+ film->
examine_and_
add_content (joined);
} catch (JoinError& e) {
error_dialog (_parent, std_to_wx (e.what ()));
}