Merge master.

[dcpomatic.git] / src / lib / content.cc

diff --git a/src/lib/content.cc b/src/lib/content.cc
index ab666db3ce111409ad691f6be1b0404a3cf3e78e..8e3b99da89b43027ede972e2b3200d2f63754475 100644 (file)
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -150,6 +150,10 @@ Content::set_position (DCPTime p)
 {
        {
                boost::mutex::scoped_lock lm (_mutex);
+               if (p == _position) {
+                       return;
+               }
+               
                _position = p;
        }
 
@@ -191,7 +195,7 @@ Content::clone () const
        xmlpp::Document doc;
        xmlpp::Node* node = doc.create_root_node ("Content");
        as_xml (node);
-       return content_factory (film, cxml::NodePtr (new cxml::Node (node)), Film::state_version);
+       return content_factory (film, cxml::NodePtr (new cxml::Node (node)), Film::current_state_version);
 }
 
 string