summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-02-04 00:56:31 +0000
committerCarl Hetherington <cth@carlh.net>2019-02-04 00:56:31 +0000
commit4050a1278d1916719797d1cf2906a932d0d5f6c2 (patch)
tree46d160d0e30ec7e213d390305966d1bb930d6f56 /src
parentd456e97975ad62d1adf585631b365aadace1507f (diff)
swaroop: hopefully fix wallpaper apparition.v2.13.112
Diffstat (limited to 'src')
-rw-r--r--src/wx/film_viewer.cc8
1 files changed, 2 insertions, 6 deletions
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));