git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@1930...

diff --git a/modules/ffmpeg/producer/input/input.cpp b/modules/ffmpeg/producer/input/input.cpp
index 7f138165cd17901d3d74a424048c163f06ebf531..fe037cb9ea75c047f5e1f3a22b00588c35fd1563 100644 (file)
--- a/modules/ffmpeg/producer/input/input.cpp
+++ b/modules/ffmpeg/producer/input/input.cpp
@@ -141,11 +141,14 @@ struct input::implementation : boost::noncopyable
        \r
        bool full() const\r
        {\r
-               return !executor_.is_running() || (buffer_size_ > MAX_BUFFER_SIZE || buffer_.size() > MAX_BUFFER_COUNT) && buffer_.size() > MIN_BUFFER_COUNT;\r
+               return (buffer_size_ > MAX_BUFFER_SIZE || buffer_.size() > MAX_BUFFER_COUNT) && buffer_.size() > MIN_BUFFER_COUNT;\r
        }\r
 \r
        void tick()\r
-       {               \r
+       {       \r
+               if(!executor_.is_running())\r
+                       return;\r
+\r
                executor_.begin_invoke([this]\r
                {                       \r
                        if(full())\r