]> git.sesse.net Git - casparcg/commitdiff
2.1.0: -frame_producer: Don't crash when getting exception i producer destructor.
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Sun, 25 Mar 2012 09:11:42 +0000 (09:11 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Sun, 25 Mar 2012 09:11:42 +0000 (09:11 +0000)
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@2736 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

core/producer/frame_producer.cpp

index c72050aae0642265712945bca0ed604ca47b5525..f4feac46ae7b3457d2fb1ecab071792b39cf0722 100644 (file)
@@ -186,8 +186,15 @@ public:
                        }\r
                        catch(...){}\r
                        \r
-                       pointer_guard.reset();\r
-                       CASPAR_LOG(info) << str << L" Destroyed.";\r
+                       try\r
+                       {\r
+                               pointer_guard.reset();\r
+                               CASPAR_LOG(info) << str << L" Destroyed.";\r
+                       }\r
+                       catch(...)\r
+                       {\r
+                               CASPAR_LOG_CURRENT_EXCEPTION();\r
+                       }\r
 \r
                        --counter;\r
                }).detach(); \r