Handle butler thread exceptions properly.

diff --git a/src/lib/butler.cc b/src/lib/butler.cc
index 7481b030118678d5c3806eb5d1b95a733d95bd81..81e09fbd3c27a54be39eb0b7c2328a420cda3e5c 100644 (file)
--- a/src/lib/butler.cc
+++ b/src/lib/butler.cc
@@ -98,6 +98,8 @@ try
        }
 } catch (boost::thread_interrupted) {
        /* The butler thread is being terminated */
+} catch (...) {
+       store_current ();
 }
 
 pair<shared_ptr<PlayerVideo>, DCPTime>

diff --git a/src/lib/butler.h b/src/lib/butler.h
index f483524482bddd86e324aebe5ed9e407f1439acf..101677558ab8128360d053548648a048e7b997b4 100644 (file)
--- a/src/lib/butler.h
+++ b/src/lib/butler.h
@@ -21,6 +21,7 @@
 #include "video_ring_buffers.h"
 #include "audio_ring_buffers.h"
 #include "audio_mapping.h"
+#include "exception_store.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 #include <boost/thread.hpp>
@@ -31,7 +32,7 @@ class Film;
 class Player;
 class PlayerVideo;
 
-class Butler : public boost::noncopyable
+class Butler : public ExceptionStore, public boost::noncopyable
 {
 public:
        Butler (boost::weak_ptr<const Film> film, boost::shared_ptr<Player> player, AudioMapping map, int audio_channels);

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 588a27e011c9f64a0b4a15f93723e74bcefc5de8..fcaca297365b4f947909cc92608915f97cfb4210 100644 (file)
--- 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