Fix mangled initial viewer frame.

1 files 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