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

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp
index d8da6102dbf0f32c8f15d1a35686f4a5b1700503..715b745307ff718e71d50aa4c0586f83e2ab1b0c 100644 (file)
--- a/modules/ffmpeg/producer/ffmpeg_producer.cpp
+++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp
@@ -100,8 +100,15 @@ public:
 \r
        ~ffmpeg_producer()\r
        {\r
-               tasks_.cancel();\r
-               tasks_.wait();\r
+               try\r
+               {\r
+                       tasks_.cancel();\r
+                       tasks_.wait();\r
+               }\r
+               catch(...)\r
+               {\r
+                       CASPAR_LOG_CURRENT_EXCEPTION();\r
+               }\r
        }\r
                \r
        virtual safe_ptr<core::basic_frame> receive(int hints)\r