X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsignal_manager.h;h=99e3b5c52c271277a64fd654d121303eed877505;hb=3896560ec6b32574092552e6807bfb413dcb2783;hp=13a45b640cede8a6d8930b0b70dcb43e56ba8031;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/lib/signal_manager.h b/src/lib/signal_manager.h
index 13a45b640..99e3b5c52 100644
--- 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,18 +18,23 @@
 
 */
 
+
 #ifndef DCPOMATIC_SIGNAL_MANAGER_H
 #define DCPOMATIC_SIGNAL_MANAGER_H
 
+
+#include "exception_store.h"
 #include <boost/asio.hpp>
 #include <boost/thread.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 */
@@ -41,13 +46,18 @@ 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) {
 		_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 +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);
@@ -87,6 +101,8 @@ private:
 	boost::thread::id _ui_thread;
 };
 
+
 extern SignalManager* signal_manager;
 
+
 #endif