Warn if there is no mail server configured when one is needed (#1046).

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

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 37f9996329aa2611ea0d4df98fa1d71508ffaf72..69496b630286eb607f405d1a38e53b14a5d37263 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -258,6 +258,8 @@ FilmViewer::refresh_panel ()
 void
 FilmViewer::get ()
 {
+       DCPOMATIC_ASSERT (_butler);
+
        pair<shared_ptr<PlayerVideo>, DCPTime> video;
        do {
                video = _butler->get_video ();
@@ -266,6 +268,8 @@ FilmViewer::get ()
                ((_left_eye->GetValue() && video.first->eyes() == EYES_RIGHT) || (_right_eye->GetValue() && video.first->eyes() == EYES_LEFT))
                );
 
+       _butler->rethrow ();
+
        if (!video.first) {
                _frame.reset ();
                refresh_panel ();
@@ -321,7 +325,7 @@ FilmViewer::timer ()
                stop ();
        }
 
-       _timer.Start (max ((next.seconds() - time().seconds()) * 1000, 0.0), wxTIMER_ONE_SHOT);
+       _timer.Start (max ((next.seconds() - time().seconds()) * 1000, 1.0), wxTIMER_ONE_SHOT);
 
        if (_butler) {
                _butler->rethrow ();
@@ -452,7 +456,7 @@ FilmViewer::start ()
        }
 
        _playing = true;
-       _timer.Start (0, wxTIMER_ONE_SHOT);
+       timer ();
 }
 
 bool