C++11 tidying.

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

diff --git a/src/lib/signal_manager.h b/src/lib/signal_manager.h
index e3a66c1c6d5a56842b04cbc26471549ab9187aea..99e3b5c52c271277a64fd654d121303eed877505 100644 (file)
--- a/src/lib/signal_manager.h
+++ b/src/lib/signal_manager.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,19 +18,23 @@
 
 */
 
+
 #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 ExceptionStore
 {
 public:
        /** Create a SignalManager.  Must be called from the UI thread */
@@ -42,6 +46,9 @@ public:
 
        virtual ~SignalManager () {}
 
+       SignalManager (Signaller const&) = delete;
+       SignalManager& operator= (Signaller const&) = delete;
+
        /* Do something next time the UI is idle */
        template <typename T>
        void when_idle (T f) {
@@ -72,7 +79,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);
@@ -90,6 +101,8 @@ private:
        boost::thread::id _ui_thread;
 };
 
+
 extern SignalManager* signal_manager;
 
+
 #endif