projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
const correctness.
[dcpomatic.git]
/
src
/
lib
/
signal_manager.h
diff --git
a/src/lib/signal_manager.h
b/src/lib/signal_manager.h
index 8041005cfd3fcb411b6d009b3c05cfb17d1ef2b2..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
#ifndef DCPOMATIC_SIGNAL_MANAGER_H
#define DCPOMATIC_SIGNAL_MANAGER_H
+#include "exception_store.h"
#include <boost/asio.hpp>
#include <boost/thread.hpp>
#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 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 */
{
public:
/** Create a SignalManager. Must be called from the UI thread */
@@
-71,7
+73,11
@@
private:
void emit (T f) {
if (boost::this_thread::get_id() == _ui_thread) {
/* already in the UI thread */
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);
} else {
/* non-UI thread; post to the service and wake up the UI */
_service.post (f);