pot/merge.

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

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 5c1b59ad6a89efd87cdbb38b266dfb2b1ee452f2..8b58d42f0f508f8e813e83acaea1544546b94164 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -330,7 +330,12 @@ 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 ();
+               return;
+       }
+
+       if (!_frame || !_film) {
                dc.Clear ();
                maybe_draw_background_image (dc);
                return;