From 739a52b20895622a1caf48d3597ae49e6ec0aeeb Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 16 Jun 2013 15:24:45 +0100 Subject: [PATCH] Fix mangled initial viewer frame. --- src/wx/film_viewer.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 3385aa2b3..d2ec01de7 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -43,6 +43,7 @@ using std::string; using std::pair; +using std::min; using std::max; using std::cout; using std::list; @@ -312,11 +313,11 @@ FilmViewer::calculate_sizes () } /* Catch silly values */ - if (_out_size.width < 64) { - _out_size.width = 64; - } + _out_size.width = max (64, _out_size.width); + _out_size.height = max (64, _out_size.height); _player->set_video_container_size (_out_size); + update_from_decoder (); } void -- 2.30.2