Merge master.

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

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index d180836941331da2da3863abe7217055b1a07ea3..cba19c07c2ba6d093d6e420d33f13f4803bc47e0 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -133,6 +133,11 @@ FilmViewer::set_film (shared_ptr<Film> f)
 
        _film = f;
 
+       _raw_frame.reset ();
+       _display_frame.reset ();
+       _panel->Refresh ();
+       _panel->Update ();
+
        if (!_film) {
                return;
        }
@@ -216,20 +221,20 @@ FilmViewer::paint_panel (wxPaintEvent &)
                dc.DrawBitmap (sub_bitmap, _display_sub_position.x, _display_sub_position.y);
        }
 
-       if (_film_size.width < _panel_size.width) {
+       if (_out_size.width < _panel_size.width) {
                wxPen p (GetBackgroundColour ());
                wxBrush b (GetBackgroundColour ());
                dc.SetPen (p);
                dc.SetBrush (b);
-               dc.DrawRectangle (_film_size.width, 0, _panel_size.width - _film_size.width, _panel_size.height);
+               dc.DrawRectangle (_out_size.width, 0, _panel_size.width - _out_size.width, _panel_size.height);
        }
 
-       if (_film_size.height < _panel_size.height) {
+       if (_out_size.height < _panel_size.height) {
                wxPen p (GetBackgroundColour ());
                wxBrush b (GetBackgroundColour ());
                dc.SetPen (p);
                dc.SetBrush (b);
-               dc.DrawRectangle (0, _film_size.height, _panel_size.width, _panel_size.height - _film_size.height);
+               dc.DrawRectangle (0, _out_size.height, _panel_size.width, _panel_size.height - _out_size.height);
        }               
 }