summaryrefslogtreecommitdiff
path: root/src/wx
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-04-18 00:07:07 +0100
committerCarl Hetherington <cth@carlh.net>2017-04-19 23:04:32 +0100
commit361352316a011e648838588ad07bf69ba5edf344 (patch)
treea44b8f5b1eee1a4eefc59df88c94b88b5d7ae0e3 /src/wx
parentb18c12353d22037d85086c150ff9b3d3a2546f4d (diff)
Handle butler thread exceptions properly.
Diffstat (limited to 'src/wx')
-rw-r--r--src/wx/film_viewer.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 588a27e01..fcaca2973 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -308,6 +308,10 @@ FilmViewer::timer ()
DCPTime const next = now + DCPTime::from_frames (1, _film->video_frame_rate ());
_timer.Start (max ((next.seconds() - time().seconds()) * 1000, 0.0), wxTIMER_ONE_SHOT);
}
+
+ if (_butler) {
+ _butler->rethrow ();
+ }
}
void