Tidy up a bit.

[dcpomatic.git] / src / wx / film_viewer.cc

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 0d17baf8325f2a22805eb3a63c51b91ff0c44a90..3c7d76bce03edaf9dad1ab53ebd12e27606f2533 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -131,7 +131,7 @@ private:
                int vw, vh;
                GetSize (&vw, &vh);
 
-               float const target = _film->format() ? _film->format()->ratio_as_float () : 1.78;
+               float const target = _film->format() ? _film->format()->ratio_as_float (_film) : 1.78;
 
                _cropped_image = _image->GetSubImage (
                        wxRect (
@@ -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);