Fix the up/down buttons in the content list.

Reported-by: Daniel Chauvet

2 files changed, 9 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 6be780b4b..80ab67b6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-27  Carl Hetherington  <cth@carlh.net>
+
+	* Fix up/down buttons in content list.
+
 2014-06-26  Carl Hetherington  <cth@carlh.net>
 
 	* Version 1.70.0 released.
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 9c980b625..de215a0d2 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -532,6 +532,8 @@ FilmEditor::film_content_changed (int property)
 		setup_dcp_name ();
 	} else if (property == ContentProperty::PATH) {
 		setup_content ();
+	} else if (property == ContentProperty::POSITION) {
+		setup_content ();
 	}
 }
 
@@ -753,6 +755,8 @@ FilmEditor::setup_content ()
 	_content->DeleteAllItems ();
 
 	ContentList content = _film->content ();
+	sort (content.begin(), content.end(), ContentSorter ());
+	
 	for (ContentList::iterator i = content.begin(); i != content.end(); ++i) {
 		int const t = _content->GetItemCount ();
 		bool const valid = (*i)->paths_valid ();
@@ -761,7 +765,7 @@ FilmEditor::setup_content ()
 		if (!valid) {
 			s = _("MISSING: ") + s;
 		}
-			
+
 		_content->InsertItem (t, std_to_wx (s));
 
 		if ((*i)->summary() == selected_summary) {