From: Carl Hetherington <cth@carlh.net>
Date: Sun, 18 Mar 2018 23:43:49 +0000 (+0000)
Subject: Fix corrupted image (and probably crashes) when changing the player's
X-Git-Tag: v2.13.1~4^2~6
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=7b56088a731550ce0b07f9454c70fde39982a69a

Fix corrupted image (and probably crashes) when changing the player's
window size; we request images of the new size with set_video_container_size
but some old ones from the butler (I think) will arrive.  Check that the
images are the right size before we try to construct a wxBitmap with them.
Should fix #1242.
---

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index ade45d766..1103db159 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -373,7 +373,7 @@ FilmViewer::paint_panel ()
 {
 	wxPaintDC dc (_panel);
 
-	if (!_frame || !_film || !_out_size.width || !_out_size.height) {
+	if (!_frame || !_film || !_out_size.width || !_out_size.height || _out_size != _frame->size()) {
 		dc.Clear ();
 		return;
 	}