Big speed-up to content joining.
authorCarl Hetherington <cth@carlh.net>
Thu, 30 Jun 2016 21:23:08 +0000 (22:23 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 30 Jun 2016 21:23:08 +0000 (22:23 +0100)
src/wx/content_menu.cc

index 3d5b002798ee72d6c8cce2d968f0733879a8b0c6..d5e190adf9e6b7ab80a54191db69c09bd6f62539 100644 (file)
@@ -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 ()));