2.1.0: -log: Improved call stack printing.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@2746 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/common/log.cpp b/common/log.cpp
index e6c2760e6bc4837561cbc872e84d24c641919ad7..8c055d652d22a5b0bfdb81445c761788e370e94a 100644 (file)
--- a/common/log.cpp
+++ b/common/log.cpp
@@ -166,10 +166,12 @@ std::wstring get_call_stack()
                virtual void OnDbgHelpErr(LPCSTR szFuncName, DWORD gle, DWORD64 addr)\r
                {\r
                }\r
-\r
                virtual void OnOutput(LPCSTR szText)\r
                {\r
-                       str_ += szText;\r
+                       std::string str = szText;\r
+\r
+                       if(str.find("internal::get_call_stack") == std::string::npos && str.find("stack_walker::ShowCallstack") == std::string::npos)\r
+                               str_ += std::move(str);\r
                }\r
        };\r
 \r

diff --git a/common/log.h b/common/log.h
index 11618be54e8c3d6d72b60e5555a8eb0a6901affb..eb6dfbef4576c7a357ec15200a01eec2350d3d60 100644 (file)
--- a/common/log.h
+++ b/common/log.h
@@ -98,7 +98,7 @@ BOOST_LOG_DECLARE_GLOBAL_LOGGER_INIT(logger, caspar_logger)
        catch(...){}\r
 \r
 #define CASPAR_LOG_CURRENT_EXCEPTION() try{\\r
-               CASPAR_LOG(error)  << caspar::u16(boost::current_exception_diagnostic_information()) << L"Current callstack:\n" << caspar::log::internal::get_call_stack();\\r
+               CASPAR_LOG(error)  << caspar::u16(boost::current_exception_diagnostic_information()) << L"Caught at:\n" << caspar::log::internal::get_call_stack();\\r
        }\\r
        catch(...){}\r
        \r