Fix mangled initial viewer frame.

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

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 3385aa2b39d805de3da2eac23b04f8a14b4d9f09..d2ec01de748f8d564a071fd938894a33aa09ece0 100644 (file)
--- 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