swaroop: hopefully fix wallpaper apparition.

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

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 90f8c9fd2d885c20c974c13eb96835ade8b6866f..dd088db20fa2d59c0c201b0fdca3e260e64c7ba3 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -330,13 +330,14 @@ FilmViewer::paint_panel ()
 {
        wxPaintDC dc (_panel);
 
-       if (!_frame || !_film || !_out_size.width || !_out_size.height || _out_size != _frame->size()) {
+       if (!_out_size.width || !_out_size.height || !_frame || _out_size != _frame->size()) {
                dc.Clear ();
-               maybe_draw_background_image (dc);
                return;
        }
 
-       if (_video_position == DCPTime() && maybe_draw_background_image (dc)) {
+       if (!_film) {
+               dc.Clear ();
+               maybe_draw_background_image (dc);
                return;
        }
 
@@ -603,7 +604,6 @@ FilmViewer::seek (DCPTime t, bool accurate)
        }
 
        PositionChanged ();
-       Seeked (position());
 }
 
 void