From: Ronag <Ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Date: Fri, 19 Aug 2011 21:50:55 +0000 (+0000)
Subject: git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches... 
X-Git-Tag: 2.0.1~99
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=756019c2518d320c51cf425a6a39512173a66b30;p=casparcg

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

diff --git a/shell/main.cpp b/shell/main.cpp
index e57662908..56118a51e 100644
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -147,12 +147,16 @@ void print_info()
 
 LONG WINAPI UserUnhandledExceptionFilter(EXCEPTION_POINTERS* info)
 {
-	CASPAR_LOG(fatal) << L"#######################\n UNHANDLED EXCEPTION: \n" 
-		<< L"Adress:" << info->ExceptionRecord->ExceptionAddress << L"\n"
-		<< L"Code:" << info->ExceptionRecord->ExceptionCode << L"\n"
-		<< L"Flag:" << info->ExceptionRecord->ExceptionFlags << L"\n"
-		<< L"Info:" << info->ExceptionRecord->ExceptionInformation << L"\n"
-		<< L"Continuing execution. \n#######################";
+	try
+	{
+		CASPAR_LOG(fatal) << L"#######################\n UNHANDLED EXCEPTION: \n" 
+			<< L"Adress:" << info->ExceptionRecord->ExceptionAddress << L"\n"
+			<< L"Code:" << info->ExceptionRecord->ExceptionCode << L"\n"
+			<< L"Flag:" << info->ExceptionRecord->ExceptionFlags << L"\n"
+			<< L"Info:" << info->ExceptionRecord->ExceptionInformation << L"\n"
+			<< L"Continuing execution. \n#######################";
+	}
+	catch(...){}
 
     return EXCEPTION_CONTINUE_EXECUTION;
 }