summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-06-30 22:23:08 +0100
committerCarl Hetherington <cth@carlh.net>2016-06-30 22:23:08 +0100
commitc31552d0d50e6f7122d26045a09e3f23fd4c1371 (patch)
treeb52c6977f2f0c42fc08958de0d47fbbca09dd33d /src
parent406cf117093a42e9a6c994cc34719869eba77caa (diff)
Big speed-up to content joining.
Diffstat (limited to 'src')
-rw-r--r--src/wx/content_menu.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 3d5b00279..d5e190adf 100644
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -160,9 +160,7 @@ ContentMenu::join ()
try {
shared_ptr<FFmpegContent> joined (new FFmpegContent (film, fc));
- BOOST_FOREACH (shared_ptr<Content> i, _content) {
- film->remove_content (i);
- }
+ film->remove_content (_content);
film->add_content (joined);
} catch (JoinError& e) {
error_dialog (_parent, std_to_wx (e.what ()));