Merge master.

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

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index e9a1a574be01477b884e34a5eeb05e30684edbcc..03f0ca646580638eb023bea63f2896846f1f77b1 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -258,12 +258,8 @@ FilmViewer::paint_panel (wxPaintEvent &)
 void
 FilmViewer::slider_moved (wxScrollEvent &)
 {
-       if (!_film || !_player) {
-               return;
-       }
-
-       if (_player->seek (_slider->GetValue() * _film->video_length() / (4096 * _film->video_frame_rate()))) {
-               return;
+       if (_film && _player) {
+               _player->seek (_slider->GetValue() * _film->video_length() / (4096 * _film->video_frame_rate()));
        }
        
        get_frame ();