X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsignal_manager.h;h=6ba4a94560b50cd79783a8b5d3e414c344f2f5fe;hb=2fc2c321a45f9cfb1d1e09989f346ee6d44c0fa4;hp=b8d892c41dc264e527d094e6336c9ebd8697125b;hpb=dd8a7d1bbb8f2afb1b98d2be856ff0a9920e180d;p=dcpomatic.git

diff --git a/src/lib/signal_manager.h b/src/lib/signal_manager.h
index b8d892c41..6ba4a9456 100644
--- a/src/lib/signal_manager.h
+++ b/src/lib/signal_manager.h
@@ -1,34 +1,37 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #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 */
@@ -38,16 +41,20 @@ public:
 		_ui_thread = boost::this_thread::get_id ();
 	}
 
+	virtual ~SignalManager () {}
+
 	/* 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 any functors that have been post()ed to _service */
-		return _service.poll ();
+		/* This executes one of the functors that has been post()ed to _service */
+		return _service.poll_one ();
 	}
 
 	/** This should wake the UI and make it call ui_idle() */
@@ -66,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);