From: Carl Hetherington Date: Mon, 4 Feb 2019 00:56:31 +0000 (+0000) Subject: swaroop: hopefully fix wallpaper apparition. X-Git-Tag: v2.13.112 X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=refs%2Ftags%2Fv2.13.112;p=dcpomatic.git swaroop: hopefully fix wallpaper apparition. --- diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 8b58d42f0..dd088db20 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -330,21 +330,17 @@ FilmViewer::paint_panel () { wxPaintDC dc (_panel); - if (!_out_size.width || !_out_size.height || (_frame && _out_size != _frame->size())) { + if (!_out_size.width || !_out_size.height || !_frame || _out_size != _frame->size()) { dc.Clear (); return; } - if (!_frame || !_film) { + if (!_film) { dc.Clear (); maybe_draw_background_image (dc); return; } - if (_video_position == DCPTime() && maybe_draw_background_image (dc)) { - return; - } - wxImage frame (_out_size.width, _out_size.height, _frame->data()[0], true); wxBitmap frame_bitmap (frame); dc.DrawBitmap (frame_bitmap, 0, max(0, (_panel_size.height - _out_size.height) / 2));