git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/core/producer/transition/transition_producer.cpp b/core/producer/transition/transition_producer.cpp
index da8390736a3a7bb14c5e58475c39fe26916a924c..ff167bcdb399fad4b22cfdbc512b164750bd8c47 100644 (file)
--- a/core/producer/transition/transition_producer.cpp
+++ b/core/producer/transition/transition_producer.cpp
@@ -70,13 +70,8 @@ public:
        draw_frame receive_impl() override\r
        {\r
                if(current_frame_ >= info_.duration)\r
-               {\r
-                       source_producer_ = core::frame_producer::empty();\r
-                       return dest_producer_->receive();\r
-               }\r
-\r
-               ++current_frame_;\r
-\r
+                       return dest_producer_->receive();               \r
+               \r
                auto dest = draw_frame::empty();\r
                auto source = draw_frame::empty();\r
 \r
@@ -92,7 +87,12 @@ public:
                        source = source_producer_->receive();\r
                        if(source == core::draw_frame::late())\r
                                source = source_producer_->last_frame();\r
-               });                             \r
+               });                     \r
+                               \r
+               current_frame_ += 1;\r
+\r
+               if(current_frame_ >= info_.duration)\r
+                       source_producer_ = core::frame_producer::empty();\r
                \r
                event_subject_  << monitor::event("transition/frame") % current_frame_ % info_.duration\r
                                                << monitor::event("transition/type") % [&]() -> std::string\r