Rename TYPE_DEBUG_PLAYER to TYPE_DEBUG_VIDEO_VIEW.

[dcpomatic.git] / src / lib / signal_manager.h

diff --git a/src/lib/signal_manager.h b/src/lib/signal_manager.h
index 13a45b640cede8a6d8930b0b70dcb43e56ba8031..6ba4a94560b50cd79783a8b5d3e414c344f2f5fe 100644 (file)
--- a/src/lib/signal_manager.h
+++ b/src/lib/signal_manager.h
@@ -21,15 +21,17 @@
 #ifndef DCPOMATIC_SIGNAL_MANAGER_H
 #define DCPOMATIC_SIGNAL_MANAGER_H
 
+#include "exception_store.h"
 #include <boost/asio.hpp>
 #include <boost/thread.hpp>
+#include <boost/noncopyable.hpp>
 
 class Signaller;
 
 /** A class to allow signals to be emitted from non-UI threads and handled
  *  by a UI thread.
  */
-class SignalManager : public boost::noncopyable
+class SignalManager : public boost::noncopyable, public ExceptionStore
 {
 public:
        /** Create a SignalManager.  Must be called from the UI thread */
@@ -47,7 +49,9 @@ public:
                _service.post (f);
        }
 
-       /** Call this in the UI when it is idle */
+       /** Call this in the UI when it is idle.
+        *  @return Number of idle handlers that were executed.
+        */
        size_t ui_idle () {
                /* This executes one of the functors that has been post()ed to _service */
                return _service.poll_one ();
@@ -69,7 +73,11 @@ private:
        void emit (T f) {
                if (boost::this_thread::get_id() == _ui_thread) {
                        /* already in the UI thread */
-                       f ();
+                       try {
+                               f ();
+                       } catch (...) {
+                               store_current ();
+                       }
                } else {
                        /* non-UI thread; post to the service and wake up the UI */
                        _service.post (f);