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

diff --git a/modules/flash/producer/flash_producer.cpp b/modules/flash/producer/flash_producer.cpp
index 5e7db8e8676f9ca9d5ec4c9e90e2f2b0f445bd20..b54b942994e7d8b922e50ff7f8d23c1e8b1aa3c2 100644 (file)
--- a/modules/flash/producer/flash_producer.cpp
+++ b/modules/flash/producer/flash_producer.cpp
@@ -22,6 +22,7 @@
 \r
 #if defined(_MSC_VER)\r
 #pragma warning (disable : 4146)\r
+#pragma warning (disable : 4244)\r
 #endif\r
 \r
 #include "flash_producer.h"\r
@@ -234,6 +235,7 @@ public:
        {\r
                executor_.clear();\r
                CASPAR_ASSERT(executor_.is_running());\r
+               frame_buffer_.clear();\r
                executor_.invoke([=]\r
                {\r
                        renderer_ = nullptr;\r
@@ -243,10 +245,7 @@ public:
        // frame_producer\r
                \r
        virtual safe_ptr<core::basic_frame> receive()\r
-       {               \r
-               if(!renderer_)\r
-                       return core::basic_frame::empty();\r
-               \r
+       {                               \r
                graph_->set_value("output-buffer", static_cast<float>(frame_buffer_.size())/static_cast<float>(frame_buffer_.capacity()));\r
                if(!frame_buffer_.try_pop(tail_))\r
                        return tail_;\r