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

diff --git a/core/mixer/mixer.cpp b/core/mixer/mixer.cpp
index fafcef02054e3a08d26de70114dd500fafe2ac40..863f25884ec701e81564e6bc1917e5fd19bf7540 100644 (file)
--- a/core/mixer/mixer.cpp
+++ b/core/mixer/mixer.cpp
@@ -125,6 +125,14 @@ public:
                                        [&]{audio = mix_audio(frames);});\r
                        \r
                        buffer_.push(std::make_pair(std::move(image), audio));\r
+\r
+                       if(buffer_.size() > buffer_size_)\r
+                       {\r
+                               auto res = std::move(buffer_.front());\r
+                               buffer_.pop();\r
+                       \r
+                               return make_safe<read_frame>(channel_.ogl(), channel_.get_format_desc().size, std::move(res.first.get()), std::move(res.second));\r
+                       }\r
                }\r
                catch(...)\r
                {\r
@@ -135,14 +143,6 @@ public:
 \r
                        CASPAR_LOG_CURRENT_EXCEPTION();\r
                }\r
-\r
-               if(buffer_.size() > buffer_size_)\r
-               {\r
-                       auto res = std::move(buffer_.front());\r
-                       buffer_.pop();\r
-                       \r
-                       return make_safe<read_frame>(channel_.ogl(), channel_.get_format_desc().size, std::move(res.first.get()), std::move(res.second));\r
-               }\r
                \r
                return make_safe<read_frame>();\r
        }\r