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

diff --git a/common/executor.h b/common/executor.h
index 2425d8ddd1ea237a03adeb9471f83c20b60dc5bf..cf25502986a93b351e99582af40bfe0b943a47ab 100644 (file)
--- a/common/executor.h
+++ b/common/executor.h
@@ -243,8 +243,12 @@ private:
                });\r
 \r
                execution_queue_.push(prio_func);\r
-               semaphore_.push(0);\r
-                                                       \r
+\r
+               if(!semaphore_.try_push(0))\r
+               {\r
+                       CASPAR_LOG(debug) << L"[executor] Overflow. Blocking caller.";\r
+                       semaphore_.push(0);\r
+               }                                       \r
                return std::move(future);               \r
        }\r
 \r