diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-09-04 12:50:25 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-09-04 12:50:25 +0100 |
| commit | a57717d54c34096d80a467ad78e9fdcecca70b2c (patch) | |
| tree | aee991e62c82443d7c2d780ce6cb7debe79ee1bc /src/wx | |
| parent | 1938b1b08d38fc199717d1875a61ef05e5b965de (diff) | |
Allow the butler to say "try again later" when get_video() is called
while it's suspended. Then make the GUI follow that suggestion.
Should
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/film_viewer.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 76e269975..d954e1818 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -294,7 +294,12 @@ FilmViewer::get () DCPOMATIC_ASSERT (_butler); do { - _player_video = _butler->get_video (); + Butler::Error e; + _player_video = _butler->get_video (&e); + if (!_player_video.first && e == Butler::AGAIN) { + signal_manager->when_idle (boost::bind(&FilmViewer::get, this)); + return; + } } while ( _player_video.first && _film->three_d() && |