Fix aff/666: thumbnail scan is run twice when changing the content file of a film.

1 files changed, 5 insertions, 1 deletions

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 0d17baf83..e647a5886 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -171,7 +171,7 @@ END_EVENT_TABLE ()
 
 FilmViewer::FilmViewer (Film* f, wxWindow* p)
 	: wxPanel (p)
-	, _film (f)
+	, _film (0)
 {
 	_sizer = new wxBoxSizer (wxVERTICAL);
 	SetSizer (_sizer);
@@ -232,6 +232,10 @@ FilmViewer::film_changed (Film::Property p)
 void
 FilmViewer::set_film (Film* f)
 {
+	if (_film == f) {
+		return;
+	}
+	
 	_film = f;
 	_thumb_panel->set_film (_film);