summaryrefslogtreecommitdiff
path: root/src/lib/content.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-05-13 21:57:40 +0100
committerCarl Hetherington <cth@carlh.net>2015-05-13 21:57:40 +0100
commit05c37bfdb86be26497d5baa448a0cbda20e33bed (patch)
treefed504a9785d818940097810968b6cccb5780b3f /src/lib/content.h
parent6718fb9d02d0b55ccd00eda8faa027972d46a4b4 (diff)
Fix crashes on x-thread signal emission.
Fix crashes on x-thread signal emission if the emitting object is destroyed between the storage of the message on the queue and the emission of the object in the UI thread.
Diffstat (limited to 'src/lib/content.h')
-rw-r--r--src/lib/content.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/content.h b/src/lib/content.h
index c6cede5fa..2b966110b 100644
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -25,6 +25,7 @@
#define DCPOMATIC_CONTENT_H
#include "types.h"
+#include "signaller.h"
#include "dcpomatic_time.h"
#include <libxml++/libxml++.h>
#include <libcxml/cxml.h>
@@ -53,7 +54,7 @@ public:
/** @class Content
* @brief A piece of content represented by one or more files on disk.
*/
-class Content : public boost::enable_shared_from_this<Content>, public boost::noncopyable
+class Content : public boost::enable_shared_from_this<Content>, public Signaller, public boost::noncopyable
{
public:
Content (boost::shared_ptr<const Film>);