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

diff --git a/common/log.cpp b/common/log.cpp
index 7a1c5a79a8b2f22bbe4cee7a5fd0571dae730345..85ee01318ebca3e6672c58b3f16bcf7c6527df54 100644 (file)
--- a/common/log.cpp
+++ b/common/log.cpp
@@ -174,9 +174,16 @@ std::wstring get_call_stack()
        };\r
 \r
        static tbb::enumerable_thread_specific<log_call_stack_walker> walkers;\r
-       auto& walker = walkers.local();\r
-       walker.ShowCallstack();\r
-       return u16(walker.flush());\r
+       try\r
+       {\r
+               auto& walker = walkers.local();\r
+               walker.ShowCallstack();\r
+               return u16(walker.flush());\r
+       }\r
+       catch(...)\r
+       {\r
+               return L"!!!";\r
+       }\r
 }\r
 \r
 }\r