summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-12-02 23:06:22 +0000
committerCarl Hetherington <cth@carlh.net>2013-12-02 23:06:22 +0000
commit13f17a79c3ff5fb7201534e64228a54314ab1619 (patch)
tree67e00602ee9f3056b9716cec53cacffc121351da
parent9c7a244ac08898b9e0b41454204bc4cba52c28e8 (diff)
Fix breakage to adding multiple files at the same time.
-rw-r--r--ChangeLog2
-rw-r--r--src/wx/film_editor.cc2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 158ea0503..793d0c8f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2013-12-02 Carl Hetherington <cth@carlh.net>
+ * Fix breakage to adding multiple files at the same time.
+
* Fix crash on double-click of "show audio" button (#278).
* Version 1.40 released.
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index bf13620e5..11926b8a1 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -747,7 +747,7 @@ FilmEditor::content_add_file_clicked ()
/* XXX: check for lots of files here and do something */
for (unsigned int i = 0; i < paths.GetCount(); ++i) {
- _film->examine_and_add_content (content_factory (_film, wx_to_std (d->GetPath ())));
+ _film->examine_and_add_content (content_factory (_film, wx_to_std (paths[i])));
}
d->Destroy ();