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

[casparcg] / shell / main.cpp

diff --git a/shell/main.cpp b/shell/main.cpp
index e5766290891cc3b8e03417873998cb12d08712c8..7abdb28f1d8765e3235ad526dccd18577f9a5829 100644 (file)
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -147,12 +147,16 @@ void print_info()
 \r
 LONG WINAPI UserUnhandledExceptionFilter(EXCEPTION_POINTERS* info)\r
 {\r
-       CASPAR_LOG(fatal) << L"#######################\n UNHANDLED EXCEPTION: \n" \r
-               << L"Adress:" << info->ExceptionRecord->ExceptionAddress << L"\n"\r
-               << L"Code:" << info->ExceptionRecord->ExceptionCode << L"\n"\r
-               << L"Flag:" << info->ExceptionRecord->ExceptionFlags << L"\n"\r
-               << L"Info:" << info->ExceptionRecord->ExceptionInformation << L"\n"\r
-               << L"Continuing execution. \n#######################";\r
+       try\r
+       {\r
+               CASPAR_LOG(fatal) << L"#######################\n UNHANDLED EXCEPTION: \n" \r
+                       << L"Adress:" << info->ExceptionRecord->ExceptionAddress << L"\n"\r
+                       << L"Code:" << info->ExceptionRecord->ExceptionCode << L"\n"\r
+                       << L"Flag:" << info->ExceptionRecord->ExceptionFlags << L"\n"\r
+                       << L"Info:" << info->ExceptionRecord->ExceptionInformation << L"\n"\r
+                       << L"Continuing execution. \n#######################";\r
+       }\r
+       catch(...){}\r
 \r
     return EXCEPTION_CONTINUE_EXECUTION;\r
 }\r
@@ -275,7 +279,7 @@ int main(int argc, wchar_t* argv[])
                                        n++;\r
                                }\r
 \r
-                               wcmd = L"MIXER 1 VIDEO GRID " + boost::lexical_cast<std::wstring>(n);\r
+                               wcmd = L"MIXER 1 GRID " + boost::lexical_cast<std::wstring>(n);\r
 \r
                                for(int i = 1; i <= num; ++i)\r
                                        wcmd += L"\r\nPLAY 1-" + boost::lexical_cast<std::wstring>(i) + L" " + file + L" LOOP";// + L" SLIDE 100 LOOP";\r