From: Carl Hetherington <cth@carlh.net>
Date: Thu, 30 Jun 2016 21:23:08 +0000 (+0100)
Subject: Big speed-up to content joining.
X-Git-Tag: v2.8.15~15
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=c31552d0d50e6f7122d26045a09e3f23fd4c1371

Big speed-up to content joining.
---

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 ()));